Merge "Remove mOnRecentsScrollListener when continuing quick switch gesture" into sc-dev (1eea5229) · Commits · e / os / android_packages_apps_Trebuchet

quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java

+6 −1

Original line number	Original line	Diff line number	Diff line
	@@ -1378,7 +1378,6 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<S>,
	private void invalidateHandlerWithLauncher() {		private void invalidateHandlerWithLauncher() {
	endLauncherTransitionController();		endLauncherTransitionController();

	mRecentsView.removeOnScrollChangedListener(mOnRecentsScrollListener);
	mRecentsView.onGestureAnimationEnd();		mRecentsView.onGestureAnimationEnd();
	resetLauncherListeners();		resetLauncherListeners();
	}		}
	@@ -1393,12 +1392,18 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<S>,
	}		}
	}		}

			/**
			* 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() {		private void resetLauncherListeners() {
	// Reset the callback for deferred activity launches		// Reset the callback for deferred activity launches
	if (!LIVE_TILE.get()) {		if (!LIVE_TILE.get()) {
	mActivityInterface.setOnDeferredActivityLaunchCallback(null);		mActivityInterface.setOnDeferredActivityLaunchCallback(null);
	}		}
	mActivity.getRootView().setOnApplyWindowInsetsListener(null);		mActivity.getRootView().setOnApplyWindowInsetsListener(null);

			mRecentsView.removeOnScrollChangedListener(mOnRecentsScrollListener);
	}		}

	private void resetStateForAnimationCancel() {		private void resetStateForAnimationCancel() {