commit 7356c13760c7837e9735823b501f248b02689e3d
author Alex Chau <alexchau@google.com> Wed Jun 22 12:39:41 2022 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Jun 22 12:39:41 2022 +0000
tree 477ce5cad520c67699434f88900196e006815879
parent 5069964ea2d2f0df991dca50330fb6eb7e972416
parent 90abf51d5b08af6dfd5ee6b56e5fe9dcadc1e808

Merge "Revert "Finish recents animation on activity destroyed."" into tm-dev am: ed2e7719cb am: 90abf51d5b

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

Change-Id: I3d68a995880a27c953164e2d4767f63ab38b0bfc
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 b3e2d91..b3ef71e 100644
--- a/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
+++ b/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
@@ -166,11 +166,7 @@
                     if (mActivity != activity) {
                         return;
                     }
-                    if (mTaskAnimationManager != null) {
-                        mTaskAnimationManager.finishRunningRecentsAnimation(true);
-                    }
                     mRecentsView = null;
-                    mActivity.unregisterActivityLifecycleCallbacks(mLifecycleCallbacks);
                     mActivity = null;
                 }
             };
@@ -1600,6 +1596,9 @@
 
     private void reset() {
         mStateCallback.setStateOnUiThread(STATE_HANDLER_INVALIDATED);
+        if (mActivity != null) {
+            mActivity.unregisterActivityLifecycleCallbacks(mLifecycleCallbacks);
+        }
     }
 
     /**