commit 7e6ec83b7c1b885e97e7387777cf1ba1dfdf113b
author Hyunyoung Song <hyunyoungs@google.com> Tue Jun 28 19:38:44 2016 +0000
committer android-build-merger <android-build-merger@google.com> Tue Jun 28 19:38:44 2016 +0000
tree 61dbcc9e18b49dd6f7e330fe7511dbffbe031ed9
parent 626b87f4632c7347186398eadf4a56ebecc59edb
parent 344ca1b827b907d5210052a76aaa298b2778db42

Merge \"Extend all apps pull up activation area to page indicator view b/29752599\" into ub-launcher3-calgary
am: 344ca1b827

Change-Id: I5dc9d8902d816ad03bd085d5573711ef216231be

src/com/android/launcher3/PagedView.java

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;
     }
 

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

diff --git a/src/com/android/launcher3/allapps/AllAppsTransitionController.java b/src/com/android/launcher3/allapps/AllAppsTransitionController.java
index 2c5a342..4e4e87c 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;
                 }
             }

src/com/android/launcher3/dragndrop/DragLayer.java

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());