commit eca04d2f23b8aab000f77f47f462580d672d310a
author Android Build Merger (Role) <noreply-android-build-merger@google.com> Tue May 08 22:35:37 2018 +0000
committer Android Build Merger (Role) <noreply-android-build-merger@google.com> Tue May 08 22:35:37 2018 +0000
tree 2572fb994214ec250d6073726d2f4fe9a3aafe36
parent 2f497e5f4dfa86b240d00b804c42a7c0b7621728
parent 578890ad93b566e9ba6380fe1349b0dad7d93427

[automerger] Fixing task icon not animating when swiping up am: 578890ad93

Change-Id: Ia53fcd0e16666905cb92a0f1530397341f8620d0

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

diff --git a/quickstep/src/com/android/quickstep/views/RecentsView.java b/quickstep/src/com/android/quickstep/views/RecentsView.java
index 82a5bdc..8c3e1a2 100644
--- a/quickstep/src/com/android/quickstep/views/RecentsView.java
+++ b/quickstep/src/com/android/quickstep/views/RecentsView.java
@@ -406,7 +406,6 @@
             taskView.bind(task);
         }
         resetTaskVisuals();
-        applyIconScale(false /* animate */);
 
         if (oldChildCount != getChildCount()) {
             mQuickScrubController.snapToNextTaskIfAvailable();
@@ -426,6 +425,7 @@
         if (mRunningTaskTileHidden) {
             setRunningTaskHidden(mRunningTaskTileHidden);
         }
+        applyIconScale(false /* animate */);
 
         updateCurveProperties();
         // Update the set of visible task's data