commit 024749a1e081a688049d4a2ac20b06fdad431897
author Tracy Zhou <tracyzhou@google.com> Mon Jul 26 21:17:38 2021 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Jul 26 21:17:38 2021 +0000
tree f59654cb39235086c34aea0dcd272be0464901e8
parent aa4c71efa0725d65ef197fc9d3f06566c9220752
parent 94e798bac1bb3b9fe8a8887857e6e44d42df7a28

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

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