Extend all apps pull up activation area to page indicator view
b/29752599
Change-Id: I3ee5efefa98defbc8f386895753946efe79708b4
Background: page indicator's background is where the caret symbol is.
diff --git a/src/com/android/launcher3/PagedView.java b/src/com/android/launcher3/PagedView.java
index 5ac3f0b..2d3e8dd 100644
--- a/src/com/android/launcher3/PagedView.java
+++ b/src/com/android/launcher3/PagedView.java
@@ -321,7 +321,7 @@
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 3157c13..585c520 100644
--- a/src/com/android/launcher3/allapps/AllAppsTransitionController.java
+++ b/src/com/android/launcher3/allapps/AllAppsTransitionController.java
@@ -137,7 +137,9 @@
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 4966938..8aed6d8 100644
--- a/src/com/android/launcher3/dragndrop/DragLayer.java
+++ b/src/com/android/launcher3/dragndrop/DragLayer.java
@@ -187,6 +187,11 @@
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());