diff options
Diffstat (limited to 'src/com')
-rw-r--r-- | src/com/android/launcher3/allapps/AllAppsContainerView.java | 18 |
1 files changed, 17 insertions, 1 deletions
diff --git a/src/com/android/launcher3/allapps/AllAppsContainerView.java b/src/com/android/launcher3/allapps/AllAppsContainerView.java index 8e4491180..989148f89 100644 --- a/src/com/android/launcher3/allapps/AllAppsContainerView.java +++ b/src/com/android/launcher3/allapps/AllAppsContainerView.java @@ -485,7 +485,23 @@ public class AllAppsContainerView extends BaseContainerView implements DragSourc @SuppressLint("ClickableViewAccessibility") @Override public boolean onTouchEvent(MotionEvent ev) { - return handleTouchEvent(ev); + int y = (int) ev.getY(); + int[] location = new int[2]; + int height = 0; + + // Ignore the touch if it is below scrubber (if enabled) or below app recycler view + if (useScroller() && useScrubber()) { + mScrubber.getLocationInWindow(location); + height = mScrubber.getHeight(); + } else { + mAppsRecyclerView.getLocationInWindow(location); + height = mAppsRecyclerView.getHeight(); + } + if (y >= location[1] + height) { + return true; + } else { + return handleTouchEvent(ev); + } } @SuppressLint("ClickableViewAccessibility") |