commit c1f07673021c6587dc3ec9f4524e30db3142d336
author Pat Manning <patmanning@google.com> Mon May 02 22:31:28 2022 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Mon May 02 22:31:28 2022 +0000
tree 80f33f17e886d8ed7545ad11059ab063913f5df2
parent b1395ceb705267046d9b032d4d460220a7b8ee1b
parent ec39c9ba3cb18d706e7ebfdb7155130e5b660b06

Merge "Finish recents animation on activity destroyed." into tm-dev am: d44f9c9741 am: ec39c9ba3c

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

Change-Id: I0c0c27ec56792a60a1240a075236b737c97713c0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java

diff --git a/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java b/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
index b90e820..5acce89 100644
--- a/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
+++ b/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
@@ -163,7 +163,11 @@
                     if (mActivity != activity) {
                         return;
                     }
+                    if (mTaskAnimationManager != null) {
+                        mTaskAnimationManager.finishRunningRecentsAnimation(true);
+                    }
                     mRecentsView = null;
+                    mActivity.unregisterActivityLifecycleCallbacks(mLifecycleCallbacks);
                     mActivity = null;
                 }
             };
@@ -1571,9 +1575,6 @@
 
     private void reset() {
         mStateCallback.setStateOnUiThread(STATE_HANDLER_INVALIDATED);
-        if (mActivity != null) {
-            mActivity.unregisterActivityLifecycleCallbacks(mLifecycleCallbacks);
-        }
     }
 
     /**