Merge "Prevent quickscrub/switch from occuring when keyguard is up" (44783f19) · Commits · e / os / android_frameworks_base

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

+2 −2

Original line number	Diff line number	Diff line
		@@ -149,7 +149,7 @@ public class NavigationBarGestureHelper implements TunerService.Tunable, Gesture
		}

		public boolean onInterceptTouchEvent(MotionEvent event) {
		if (mNavigationBarView.inScreenPinning()) {
		if (mNavigationBarView.inScreenPinning() \|\| mStatusBar.isKeyguardShowing()) {
		return false;
		}

		@@ -182,7 +182,7 @@ public class NavigationBarGestureHelper implements TunerService.Tunable, Gesture
		}

		public boolean onTouchEvent(MotionEvent event) {
		if (mNavigationBarView.inScreenPinning()) {
		if (mNavigationBarView.inScreenPinning() \|\| mStatusBar.isKeyguardShowing()) {
		return false;
		}