commit cc67d7281362427c0dd7c92305e4ae6276858145
author TreeHugger Robot <treehugger-gerrit@google.com> Thu Apr 22 00:40:03 2021 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Apr 22 00:40:03 2021 +0000
tree 9c3b9ede64a2e8d4d4526a5913b4219f7f6a67be
parent 49d6bb660b5ba39206141e3b16b00d2811718e70
parent 2e3b7c6e97526f9b4ec392dfd7f6a433a3ee7300

Merge "Redraw live tile in updatePageOffsets()" into sc-dev

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 e4fa1aa..6ed490d 100644
--- a/quickstep/src/com/android/quickstep/views/RecentsView.java
+++ b/quickstep/src/com/android/quickstep/views/RecentsView.java
@@ -1420,7 +1420,9 @@
         mTaskListChangeId = -1;
         mFocusedTaskId = -1;
 
-        mRecentsAnimationController = null;
+        if (mRecentsAnimationController != null) {
+            finishRecentsAnimation(true /* toRecents */, null);
+        }
         mLiveTileParams.setTargetSet(null);
         mLiveTileTaskViewSimulator.setDrawsBelowRecents(true);
 
@@ -2526,6 +2528,10 @@
                     ? ((TaskView) child).getPrimaryTaskOffsetTranslationProperty()
                     : mOrientationHandler.getPrimaryViewTranslate();
             translationProperty.set(child, totalTranslation);
+            if (LIVE_TILE.get() && mEnableDrawingLiveTile && i == getRunningTaskIndex()) {
+                mLiveTileTaskViewSimulator.taskPrimaryTranslation.value = totalTranslation;
+                redrawLiveTile();
+            }
         }
         updateCurveProperties();
     }