Merge "Ensure prediction bar is visible when intercepting touch events. " into ub-launcher3-burnaby (b4de9140) · Commits · e / os / BlissLauncher3

src/com/android/launcher3/AppsContainerView.java

+11 −6

Original line number	Diff line number	Diff line
		@@ -659,6 +659,7 @@ public class AppsContainerView extends BaseContainerView implements DragSource,
		// We workaround the fact that the recycler view needs the touches for the scroll
		// and we want to intercept it for clicks in the prediction bar by handling clicks
		// and long clicks in the prediction bar ourselves.
		if (mPredictionBarView != null && mPredictionBarView.getVisibility() == View.VISIBLE) {
		mPredictionIconTouchDownPos.set(x, y);
		mPredictionIconUnderTouch = findPredictedAppAtCoordinate(x, y);
		if (mPredictionIconUnderTouch != null) {
		@@ -666,6 +667,7 @@ public class AppsContainerView extends BaseContainerView implements DragSource,
		new CheckLongPressHelper(mPredictionIconUnderTouch, this);
		mPredictionIconCheckForLongPress.postCheckForLongPress();
		}
		}

		if (!mFixedBounds.isEmpty()) {
		// Outset the fixed bounds and check if the touch is outside all apps
		@@ -731,6 +733,9 @@ public class AppsContainerView extends BaseContainerView implements DragSource,
		Utilities.mapCoordInSelfToDescendent(mPredictionBarView, this, coord);
		for (int i = 0; i < mPredictionBarView.getChildCount(); i++) {
		View child = mPredictionBarView.getChildAt(i);
		if (child.getVisibility() != View.VISIBLE) {
		continue;
		}
		child.getHitRect(hitRect);
		if (hitRect.contains(coord[0], coord[1])) {
		return child;