Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 344ca1b8 authored by Hyunyoung Song's avatar Hyunyoung Song Committed by Android (Google) Code Review
Browse files

Merge "Extend all apps pull up activation area to page indicator view... 

Merge "Extend all apps pull up activation area to page indicator view b/29752599" into ub-launcher3-calgary
parents f7e5e374 77441698

src/com/android/launcher3/PagedView.java

+1 −1
Original line number Diff line number Diff line
@@ -321,7 +321,7 @@ public abstract class PagedView extends ViewGroup implements ViewGroup.OnHierarc 
        return (getMeasuredHeight() - getViewportHeight()) / 2;

    }



    PageIndicator getPageIndicator() {

    public PageIndicator getPageIndicator() {

        return mPageIndicator;

    }

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

+3 −1
Original line number Diff line number Diff line
@@ -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;

                }

            }

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

+5 −0
Original line number Diff line number Diff line
@@ -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());