commit 5de2802a4cda9601b03bb82624a6f7d60aafd342
author Tracy Zhou <tracyzhou@google.com> Mon Jul 26 21:50:01 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Mon Jul 26 21:50:01 2021 +0000
tree bf40c3d89f49f3ea26556d6d4eb34ea40264d875
parent 909f00873d939c0814bddd23ff2d55c5ee65030b
parent c94002600a580e2b2dbeca3cdf72b5b63a238fbf

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

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

Change-Id: Ica40da0945ef3c4b83a4be0d489333b73e123949

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