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

Commit 77441698 authored Jun 27, 2016 by Hyunyoung Song

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.

parent f50b3cb3

src/com/android/launcher3/PagedView.java

+1 −1

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

	PageIndicator getPageIndicator() {		public PageIndicator getPageIndicator() {
	return mPageIndicator;		return mPageIndicator;
	}		}

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

+3 −1

Original line number	Original line	Diff line number	Diff line
	@@ -137,7 +137,9 @@ public class AllAppsTransitionController implements TouchController, VerticalPul
	return true;		return true;
	}		}
	} else {		} else {
	if (mLauncher.getDragLayer().isEventOverHotseat(ev) && !grid.isVerticalBarLayout()) {		if ((mLauncher.getDragLayer().isEventOverHotseat(ev)
			\|\| mLauncher.getDragLayer().isEventOverPageIndicator(ev))
			&& !grid.isVerticalBarLayout()) {
	return true;		return true;
	}		}
	}		}

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

+5 −0

Original line number	Original line	Diff line number	Diff line
	@@ -187,6 +187,11 @@ public class DragLayer extends InsettableFrameLayout {
	removeView(mOverlayView);		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) {		public boolean isEventOverHotseat(MotionEvent ev) {
	getDescendantRectRelativeToSelf(mLauncher.getHotseat(), mHitRect);		getDescendantRectRelativeToSelf(mLauncher.getHotseat(), mHitRect);
	return mHitRect.contains((int) ev.getX(), (int) ev.getY());		return mHitRect.contains((int) ev.getX(), (int) ev.getY());