commit 5caf5e66eca91df8a039952f3aa156bbdc9aaa38
author Tony Wickham <twickham@google.com> Fri Apr 23 23:45:17 2021 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Apr 23 23:45:17 2021 +0000
tree 57c6ec2e51eff4637104a90856f1b74eacbaaf3f
parent 5018eff3a2c2c645e6bf8d2c8286268f72005701
parent af4ca9058727b539fa1f8fcb0fb6e3db6451ff0a

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 cc5a2e6..d59d120 100644
--- a/quickstep/src/com/android/quickstep/views/RecentsView.java
+++ b/quickstep/src/com/android/quickstep/views/RecentsView.java
@@ -1513,7 +1513,14 @@
         mTaskListChangeId = -1;
         mFocusedTaskId = -1;
 
-        mRecentsAnimationController = null;
+        if (mRecentsAnimationController != null) {
+            if (LIVE_TILE.get() && mEnableDrawingLiveTile) {
+                // We are still drawing the live tile, finish it now to clean up.
+                finishRecentsAnimation(true /* toRecents */, null);
+            } else {
+                mRecentsAnimationController = null;
+            }
+        }
         mLiveTileParams.setTargetSet(null);
         mLiveTileTaskViewSimulator.setDrawsBelowRecents(true);
 
@@ -2694,6 +2701,10 @@
                     ? ((TaskView) child).getPrimaryTaskOffsetTranslationProperty()
                     : mOrientationHandler.getPrimaryViewTranslate();
             translationProperty.set(child, totalTranslation);
+            if (LIVE_TILE.get() && mEnableDrawingLiveTile && i == getRunningTaskIndex()) {
+                mLiveTileTaskViewSimulator.taskPrimaryTranslation.value = totalTranslation;
+                redrawLiveTile();
+            }
         }
         updateCurveProperties();
     }