diff options
| -rw-r--r-- | src/com/android/launcher3/PagedView.java | 2 | ||||
| -rw-r--r-- | src/com/android/launcher3/allapps/AllAppsTransitionController.java | 4 | ||||
| -rw-r--r-- | src/com/android/launcher3/dragndrop/DragLayer.java | 5 |
3 files changed, 9 insertions, 2 deletions
diff --git a/src/com/android/launcher3/PagedView.java b/src/com/android/launcher3/PagedView.java index 5ac3f0bab..2d3e8dd04 100644 --- a/src/com/android/launcher3/PagedView.java +++ b/src/com/android/launcher3/PagedView.java @@ -321,7 +321,7 @@ public abstract class PagedView extends ViewGroup implements ViewGroup.OnHierarc return (getMeasuredHeight() - getViewportHeight()) / 2; } - PageIndicator getPageIndicator() { + public PageIndicator getPageIndicator() { return mPageIndicator; } diff --git a/src/com/android/launcher3/allapps/AllAppsTransitionController.java b/src/com/android/launcher3/allapps/AllAppsTransitionController.java index 3157c133f..585c5206d 100644 --- a/src/com/android/launcher3/allapps/AllAppsTransitionController.java +++ b/src/com/android/launcher3/allapps/AllAppsTransitionController.java @@ -137,7 +137,9 @@ public class AllAppsTransitionController implements TouchController, VerticalPul return true; } } else { - if (mLauncher.getDragLayer().isEventOverHotseat(ev) && !grid.isVerticalBarLayout()) { + if ((mLauncher.getDragLayer().isEventOverHotseat(ev) + || mLauncher.getDragLayer().isEventOverPageIndicator(ev)) + && !grid.isVerticalBarLayout()) { return true; } } diff --git a/src/com/android/launcher3/dragndrop/DragLayer.java b/src/com/android/launcher3/dragndrop/DragLayer.java index 496693835..8aed6d834 100644 --- a/src/com/android/launcher3/dragndrop/DragLayer.java +++ b/src/com/android/launcher3/dragndrop/DragLayer.java @@ -187,6 +187,11 @@ public class DragLayer extends InsettableFrameLayout { removeView(mOverlayView); } + public boolean isEventOverPageIndicator(MotionEvent ev) { + getDescendantRectRelativeToSelf(mLauncher.getWorkspace().getPageIndicator(), mHitRect); + return mHitRect.contains((int) ev.getX(), (int) ev.getY()); + } + public boolean isEventOverHotseat(MotionEvent ev) { getDescendantRectRelativeToSelf(mLauncher.getHotseat(), mHitRect); return mHitRect.contains((int) ev.getX(), (int) ev.getY()); |