commit 2862aecc40aca9e97d4eaf2d75d3e301671e9eb9
author Tracy Zhou <tracyzhou@google.com> Tue Nov 30 04:55:58 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Tue Nov 30 04:55:58 2021 +0000
tree 0b194bbe364726e0a5cd38c4107dff6f4ec3d418
parent 2dc067bd88c2a66902fd1abcb12bc5efeb6813f7
parent 260b90c7adcd08593467516a274b7602eb06ad01

Merge "Reset live tile params along with resetTaskVisuals" into sc-v2-dev am: 260b90c7ad

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

Change-Id: I708bb79bba4ffb0f7945ce537ecdf6e7a3088ee9

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 e9010d2..3f212c6 100644
--- a/quickstep/src/com/android/quickstep/views/RecentsView.java
+++ b/quickstep/src/com/android/quickstep/views/RecentsView.java
@@ -1508,6 +1508,16 @@
             }
         }
         if (ENABLE_QUICKSTEP_LIVE_TILE.get()) {
+            // resetTaskVisuals is called at the end of dismiss animation which could update
+            // primary and secondary translation of the live tile cut out. We will need to do so
+            // here accordingly.
+            runActionOnRemoteHandles(remoteTargetHandle -> {
+                TaskViewSimulator simulator = remoteTargetHandle.getTaskViewSimulator();
+                simulator.taskPrimaryTranslation.value = 0;
+                simulator.taskSecondaryTranslation.value = 0;
+                simulator.fullScreenProgress.value = 0;
+                simulator.recentsViewScale.value = 1;
+            });
             // Similar to setRunningTaskHidden below, reapply the state before runningTaskView is
             // null.
             if (!mRunningTaskShowScreenshot) {