Merge "Prevent hotseat touch hijack" into ub-launcher3-master (4cc857ae) · Commits · e / os / BlissLauncher3

src/com/android/launcher3/allapps/AllAppsContainerView.java

+12 −2

Original line number	Original line	Diff line number	Diff line
	@@ -98,8 +98,8 @@ public class AllAppsContainerView extends SpringRelativeLayout implements DragSo
	protected boolean mUsingTabs;		protected boolean mUsingTabs;
	private boolean mSearchModeWhileUsingTabs = false;		private boolean mSearchModeWhileUsingTabs = false;

	private RecyclerViewFastScroller mTouchHandler;		protected RecyclerViewFastScroller mTouchHandler;
	private final Point mFastScrollerOffset = new Point();		protected final Point mFastScrollerOffset = new Point();

	private final MultiValueAlpha mMultiValueAlpha;		private final MultiValueAlpha mMultiValueAlpha;

	@@ -238,6 +238,16 @@ public class AllAppsContainerView extends SpringRelativeLayout implements DragSo

	@Override		@Override
	public boolean onTouchEvent(MotionEvent ev) {		public boolean onTouchEvent(MotionEvent ev) {
			if (ev.getAction() == MotionEvent.ACTION_DOWN) {
			AllAppsRecyclerView rv = getActiveRecyclerView();
			if (rv != null && rv.getScrollbar().isHitInParent(ev.getX(), ev.getY(),
			mFastScrollerOffset)) {
			mTouchHandler = rv.getScrollbar();
			} else {
			mTouchHandler = null;

			}
			}
	if (mTouchHandler != null) {		if (mTouchHandler != null) {
	mTouchHandler.handleTouchEvent(ev, mFastScrollerOffset);		mTouchHandler.handleTouchEvent(ev, mFastScrollerOffset);
	return true;		return true;

+4 −1

Original line number	Original line	Diff line number	Diff line
	@@ -51,7 +51,10 @@ public class LauncherAllAppsContainerView extends AllAppsContainerView {
	public boolean onInterceptTouchEvent(MotionEvent ev) {		public boolean onInterceptTouchEvent(MotionEvent ev) {
	// The AllAppsContainerView houses the QSB and is hence visible from the Workspace		// The AllAppsContainerView houses the QSB and is hence visible from the Workspace
	// Overview states. We shouldn't intercept for the scrubber in these cases.		// Overview states. We shouldn't intercept for the scrubber in these cases.
	if (!mLauncher.isInState(LauncherState.ALL_APPS)) return false;		if (!mLauncher.isInState(LauncherState.ALL_APPS)) {
			mTouchHandler = null;
			return false;
			}

	return super.onInterceptTouchEvent(ev);		return super.onInterceptTouchEvent(ev);
	}		}