diff --git a/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java b/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java index d04bfe95e2..79935d75cb 100644 --- a/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java +++ b/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java @@ -1376,7 +1376,6 @@ public abstract class AbsSwipeUpHandler, private void invalidateHandlerWithLauncher() { endLauncherTransitionController(); - mRecentsView.removeOnScrollChangedListener(mOnRecentsScrollListener); mRecentsView.onGestureAnimationEnd(); resetLauncherListeners(); } @@ -1391,12 +1390,18 @@ public abstract class AbsSwipeUpHandler, } } + /** + * Unlike invalidateHandlerWithLauncher, this is called even when switching consumers, e.g. on + * continued quick switch gesture, which cancels the previous handler but doesn't invalidate it. + */ private void resetLauncherListeners() { // Reset the callback for deferred activity launches if (!LIVE_TILE.get()) { mActivityInterface.setOnDeferredActivityLaunchCallback(null); } mActivity.getRootView().setOnApplyWindowInsetsListener(null); + + mRecentsView.removeOnScrollChangedListener(mOnRecentsScrollListener); } private void resetStateForAnimationCancel() {