commit 1c5a3e082b0ceaef2bf6a3448e6d0068fca223c6
author Tony Wickham <twickham@google.com> Fri Jun 19 05:52:44 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri Jun 19 05:52:44 2020 +0000
tree 317245670323e86fac39b94833cd5914b6805b58
parent cc3e9f06149c49ebf272d11459a31e5cc1ad7044
parent f13a51c4b81fa3ed75a84bf481450019df696b7a

Merge "Inline TaskView#resetVisualProperties() into RecentsView" into ub-launcher3-rvc-dev am: f13a51c4b8

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/11917351

Change-Id: I6d7f8483d94e7fcd480dca0d1b3bd72f7865f884

quickstep/recents_ui_overrides/src/com/android/quickstep/views/RecentsView.java

diff --git a/quickstep/recents_ui_overrides/src/com/android/quickstep/views/RecentsView.java b/quickstep/recents_ui_overrides/src/com/android/quickstep/views/RecentsView.java
index 99afe39..8604c6c 100644
--- a/quickstep/recents_ui_overrides/src/com/android/quickstep/views/RecentsView.java
+++ b/quickstep/recents_ui_overrides/src/com/android/quickstep/views/RecentsView.java
@@ -798,8 +798,10 @@
         for (int i = getTaskViewCount() - 1; i >= 0; i--) {
             TaskView taskView = getTaskViewAt(i);
             if (mIgnoreResetTaskId != taskView.getTask().key.id) {
-                taskView.resetVisualProperties();
+                taskView.resetViewTransforms();
                 taskView.setStableAlpha(mContentAlpha);
+                taskView.setFullscreenProgress(mFullscreenProgress);
+                taskView.setModalness(mTaskModalness);
             }
         }
         if (mRunningTaskTileHidden) {

quickstep/recents_ui_overrides/src/com/android/quickstep/views/TaskView.java

diff --git a/quickstep/recents_ui_overrides/src/com/android/quickstep/views/TaskView.java b/quickstep/recents_ui_overrides/src/com/android/quickstep/views/TaskView.java
index 411bab4..8bdf99e 100644
--- a/quickstep/recents_ui_overrides/src/com/android/quickstep/views/TaskView.java
+++ b/quickstep/recents_ui_overrides/src/com/android/quickstep/views/TaskView.java
@@ -545,7 +545,7 @@
         setIconAndDimTransitionProgress(iconScale, invert);
     }
 
-    private void resetViewTransforms() {
+    protected void resetViewTransforms() {
         setCurveScale(1);
         setTranslationX(0f);
         setTranslationY(0f);
@@ -554,12 +554,6 @@
         setIconScaleAndDim(1);
     }
 
-    public void resetVisualProperties() {
-        resetViewTransforms();
-        setFullscreenProgress(0);
-        setModalness(0);
-    }
-
     public void setStableAlpha(float parentAlpha) {
         mStableAlpha = parentAlpha;
         setAlpha(mStableAlpha);