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

This commit is contained in:
Winson Chung
2021-06-17 16:48:42 +00:00
committed by Android (Google) Code Review

View File

@@ -1381,11 +1381,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() {