commit c94002600a580e2b2dbeca3cdf72b5b63a238fbf
author Tracy Zhou <tracyzhou@google.com> Mon Jul 26 21:35:42 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Mon Jul 26 21:35:42 2021 +0000
tree f658b43dcf20f00e58259ac0da41690c45c99b34
parent 458b223ca8320f3d21e6706e967209c9c09fb6d4
parent 024749a1e081a688049d4a2ac20b06fdad431897

Merge "Reset current task and dequeue overview commands when recents animation is cancelled" into sc-dev am: 024749a1e0

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

Change-Id: I881b9d322e67699ecea9414b3db2f72d05e80c3b

quickstep/src/com/android/quickstep/OverviewCommandHelper.java

diff --git a/quickstep/src/com/android/quickstep/OverviewCommandHelper.java b/quickstep/src/com/android/quickstep/OverviewCommandHelper.java
index 742d02d..89c2ed8 100644
--- a/quickstep/src/com/android/quickstep/OverviewCommandHelper.java
+++ b/quickstep/src/com/android/quickstep/OverviewCommandHelper.java
@@ -15,7 +15,6 @@
  */
 package com.android.quickstep;
 
-import static com.android.launcher3.config.FeatureFlags.ENABLE_QUICKSTEP_LIVE_TILE;
 import static com.android.launcher3.util.Executors.MAIN_EXECUTOR;
 import static com.android.quickstep.util.ActiveGestureLog.INTENT_EXTRA_LOG_TRACE_ID;
 
@@ -199,6 +198,12 @@
             public void onRecentsAnimationCanceled(ThumbnailData thumbnailData) {
                 interactionHandler.onGestureCancelled();
                 cmd.removeListener(this);
+
+                RecentsView createdRecents =
+                        activityInterface.getCreatedActivity().getOverviewPanel();
+                if (createdRecents != null) {
+                    createdRecents.onRecentsAnimationComplete();
+                }
             }
         };