Merge "Don't move down all apps container when touching near scroll bar." into tm-qpr-dev (30c2bdda) · Commits · e / os / BlissLauncher3

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

+8 −10

Original line number	Diff line number	Diff line
		@@ -353,16 +353,10 @@ public class ActivityAllAppsContainerView<T extends Context & ActivityContext>

		public boolean shouldContainerScroll(MotionEvent ev) {
		BaseDragLayer dragLayer = mActivityContext.getDragLayer();
		// IF the MotionEvent is inside the search box, and the container keeps on receiving
		// touch input, container should move down.
		if (dragLayer.isEventOverView(mSearchContainer, ev)) {
		return true;
		}
		// Scroll if not within the container view (e.g. over large-screen scrim).
		if (!dragLayer.isEventOverView(getVisibleContainerView(), ev)) {
		return true;
		}
		if (dragLayer.isEventOverView(mBottomSheetHandleArea, ev)) {
		// IF the MotionEvent is inside the search box or handle area, and the container keeps on
		// receiving touch input, container should move down.
		if (dragLayer.isEventOverView(mSearchContainer, ev)
		\|\| dragLayer.isEventOverView(mBottomSheetHandleArea, ev)) {
		return true;
		}
		AllAppsRecyclerView rv = getActiveRecyclerView();
		@@ -374,6 +368,10 @@ public class ActivityAllAppsContainerView<T extends Context & ActivityContext>
		&& dragLayer.isEventOverView(rv.getScrollbar(), ev)) {
		return false;
		}
		// Scroll if not within the container view (e.g. over large-screen scrim).
		if (!dragLayer.isEventOverView(getVisibleContainerView(), ev)) {
		return true;
		}
		return rv.shouldContainerScroll(ev, dragLayer);
		}

+1 −0

Original line number	Diff line number	Diff line
		@@ -333,6 +333,7 @@ public class RecyclerViewFastScroller extends View {
		}
		}

		@Override
		public void onDraw(Canvas canvas) {
		if (mThumbOffsetY < 0 \|\| mRv == null) {
		return;