commit 44783f1901d808b98058c444c306718c5b832128
author TreeHugger Robot <treehugger-gerrit@google.com> Mon Feb 26 23:48:34 2018 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Feb 26 23:48:34 2018 +0000
tree 6be4d57ac2156cd23f94662e399dc2ccaadc70ae
parent 5622f47532193c9eea7f549c5bf431df2db13884
parent 622a7e6a6a5a62d2a6edd77ccf0a87700f8b6544

Merge "Prevent quickscrub/switch from occuring when keyguard is up"

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

diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationBarGestureHelper.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationBarGestureHelper.java
index 57d78dd..320b56f 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationBarGestureHelper.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationBarGestureHelper.java
@@ -149,7 +149,7 @@
     }
 
     public boolean onInterceptTouchEvent(MotionEvent event) {
-        if (mNavigationBarView.inScreenPinning()) {
+        if (mNavigationBarView.inScreenPinning() || mStatusBar.isKeyguardShowing()) {
             return false;
         }
 
@@ -182,7 +182,7 @@
     }
 
     public boolean onTouchEvent(MotionEvent event) {
-        if (mNavigationBarView.inScreenPinning()) {
+        if (mNavigationBarView.inScreenPinning() || mStatusBar.isKeyguardShowing()) {
             return false;
         }