diff options
| author | Alex Chau <alexchau@google.com> | 2022-06-22 11:59:31 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2022-06-22 11:59:31 +0000 |
| commit | ed2e7719cb53dcbfa5110d46076b255749009225 (patch) | |
| tree | 64326e16c5ba3f1c1e6d81433bd67032349082bd /quickstep/src | |
| parent | ccd3f9b40aaa6e5dad0cb13e5c4e44a7ca8a2012 (diff) | |
| parent | 506165689fb23f955a09b83bca99cfe1805a49cf (diff) | |
| download | Launcher3-ed2e7719cb53dcbfa5110d46076b255749009225.tar.gz | |
Merge "Revert "Finish recents animation on activity destroyed."" into tm-dev
Diffstat (limited to 'quickstep/src')
| -rw-r--r-- | quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java b/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java index d676f7d195..76f7718765 100644 --- a/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java +++ b/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java @@ -166,11 +166,7 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<S>, if (mActivity != activity) { return; } - if (mTaskAnimationManager != null) { - mTaskAnimationManager.finishRunningRecentsAnimation(true); - } mRecentsView = null; - mActivity.unregisterActivityLifecycleCallbacks(mLifecycleCallbacks); mActivity = null; } }; @@ -1599,6 +1595,9 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<S>, private void reset() { mStateCallback.setStateOnUiThread(STATE_HANDLER_INVALIDATED); + if (mActivity != null) { + mActivity.unregisterActivityLifecycleCallbacks(mLifecycleCallbacks); + } } /** |