Merge "Do some additional cleanup when switching handlers" into sc-dev am: caabfa1519

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

Change-Id: I59c266315e6c5fe8989dcff36fe395457792c189
This commit is contained in:
Winson Chung
2021-06-17 17:01:52 +00:00
committed by Automerger Merge Worker

View File

@@ -1382,11 +1382,17 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<S>,
/**
* Cancels any running animation so that the active target can be overriden by a new swipe
* handle (in case of quick switch).
* handler (in case of quick switch).
*/
private void cancelCurrentAnimation() {
mCanceled = true;
mCurrentShift.cancelAnimation();
// Cleanup when switching handlers
mInputConsumerProxy.unregisterCallback();
mActivityInitListener.unregister();
ActivityManagerWrapper.getInstance().unregisterTaskStackListener(mActivityRestartListener);
mTaskSnapshot = null;
}
private void invalidateHandler() {