commit b65ce3cef7ebf6f4a4bef59b0af122c936a3c797
author TreeHugger Robot <treehugger-gerrit@google.com> Thu Apr 22 00:53:09 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu Apr 22 00:53:09 2021 +0000
tree cb50e186fe1735d822f7804968f304163876ffb8
parent edc3eb135ea1cf2d094006dba2e854258cabaac4
parent cc67d7281362427c0dd7c92305e4ae6276858145

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

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

Change-Id: I1af5d5aed6e7664d0cd063f8012301d9276d999b

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();
     }