Merge "Fixing QS reacting to touches in notifications area in split shade" into sc-v2-dev (df844e0c) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelViewController.java

+9 −4

Original line number	Diff line number	Diff line
		@@ -1903,6 +1903,9 @@ public class NotificationPanelViewController extends PanelViewController {


		private boolean handleQsTouch(MotionEvent event) {
		if (mShouldUseSplitNotificationShade && touchXOutsideOfQs(event.getX())) {
		return false;
		}
		final int action = event.getActionMasked();
		if (action == MotionEvent.ACTION_DOWN && getExpandedFraction() == 1f
		&& mBarState != KEYGUARD && !mQsExpanded && isQsExpansionEnabled()) {
		@@ -1944,8 +1947,12 @@ public class NotificationPanelViewController extends PanelViewController {
		return false;
		}

		private boolean touchXOutsideOfQs(float touchX) {
		return touchX < mQsFrame.getX() \|\| touchX > mQsFrame.getX() + mQsFrame.getWidth();
		}

		private boolean isInQsArea(float x, float y) {
		if (x < mQsFrame.getX() \|\| x > mQsFrame.getX() + mQsFrame.getWidth()) {
		if (touchXOutsideOfQs(x)) {
		return false;
		}
		// Let's reject anything at the very bottom around the home handle in gesture nav
		@@ -4094,9 +4101,7 @@ public class NotificationPanelViewController extends PanelViewController {
		@Override
		public void flingTopOverscroll(float velocity, boolean open) {
		// in split shade mode we want to expand/collapse QS only when touch happens within QS
		if (mShouldUseSplitNotificationShade
		&& (mInitialTouchX < mQsFrame.getX()
		\|\| mInitialTouchX > mQsFrame.getX() + mQsFrame.getWidth())) {
		if (mShouldUseSplitNotificationShade && touchXOutsideOfQs(mInitialTouchX)) {
		return;
		}
		mLastOverscroll = 0f;