Merge "Handle down touch events in the home gesture area on locked shade" into main (8c74fe43) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/shade/NotificationPanelViewController.java

+12 −3

Original line number	Diff line number	Diff line
		@@ -3975,10 +3975,14 @@ public final class NotificationPanelViewController implements
		@Override
		public boolean onTouchEvent(MotionEvent event) {
		if (!mUseExternalTouch) {
		if (isLockedShadeHomeGestureEvent(event)) {
		mShadeLog.d("onTouch: down motion event in home gesture area");
		} else {
		mShadeLog.d("onTouch: external touch handling disabled");
		// Consume touches below notifications on keyguard to allow for expansion
		return mStatusBarStateController.getState() == StatusBarState.KEYGUARD;
		}
		}

		if (mAlternateBouncerInteractor.isVisibleState()) {
		mShadeLog.d("onTouch: alternate bouncer visible; ignoring touch");
		@@ -4075,6 +4079,11 @@ public final class NotificationPanelViewController implements
		return !mDozing \|\| handled;
		}

		private boolean isLockedShadeHomeGestureEvent(MotionEvent event) {
		return mBarState == SHADE_LOCKED && event.getActionMasked() == MotionEvent.ACTION_DOWN
		&& isInGestureNavHomeHandleArea(event.getY());
		}

		private boolean handleTouch(MotionEvent event) {
		if (mInstantExpanding) {
		mShadeLog.logMotionEvent(event,