commit 97575d92ca9175514f20b28b0fc7f472ba85bf8a
author Tracy Zhou <tracyzhou@google.com> Mon Mar 22 21:56:22 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Mon Mar 22 21:56:22 2021 +0000
tree 163fe5aae14024f1e76870d679a59153b9901e4d
parent 596ae53fea1d886957a7cbe5883e5b85d4a3907c
parent 5ac61e1a2ec468a4793328f9e168ac539f5cc51a

Merge "Support live tile with OVERVIEW_GRID" into sc-dev am: 5ac61e1a2e

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

Change-Id: Ib527c23f2912c797eeb954fabeefb34bfd8039a9

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 7adfc1c..f216985 100644
--- a/quickstep/src/com/android/quickstep/views/RecentsView.java
+++ b/quickstep/src/com/android/quickstep/views/RecentsView.java
@@ -1018,6 +1018,7 @@
             mLiveTileTaskViewSimulator.taskSecondaryTranslation.value = 0;
             mLiveTileTaskViewSimulator.fullScreenProgress.value = 0;
             mLiveTileTaskViewSimulator.recentsViewScale.value = 1;
+            mLiveTileTaskViewSimulator.gridProgress.value = 0;
         }
         if (mRunningTaskTileHidden) {
             setRunningTaskHidden(mRunningTaskTileHidden);
@@ -1740,6 +1741,7 @@
         for (int i = 0; i < taskCount; i++) {
             getTaskViewAt(i).setGridProgress(gridProgress);
         }
+        mLiveTileTaskViewSimulator.gridProgress.value = gridProgress;
         mClearAllButton.setGridProgress(gridProgress);
     }