commit d790ea1d28da756974735dce61ed0ab4223bcde4
author Tracy Zhou <tracyzhou@google.com> Mon Jul 26 21:53:40 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Mon Jul 26 21:53:40 2021 +0000
tree 5643aefbc783cfd6e9243f778752bab0f0d0f3b2
parent 288196cf15e1fcb89afb5837f84113107c5af642
parent 4ea4ed5d05360e8110eaf3d328d7bdbb07c6defe

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

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

Change-Id: I384267e7f71be0908ec48d82270684a0219cffc0

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