Merge "Disable assist gesture when keyguard is active" into jb-dev

Author: John Spurlock

packages/SystemUI/src/com/android/systemui/statusbar/BaseStatusBar.java

@@ -953,4 +953,9 @@ protected boolean showNotificationEvenIfUnprovisioned(StatusBarNotification sbn)
         }
         return false;
     }
+
+    public boolean inKeyguardRestrictedInputMode() {
+        KeyguardManager km = (KeyguardManager) mContext.getSystemService(Context.KEYGUARD_SERVICE);
+        return km.inKeyguardRestrictedInputMode();
+    }
 }

packages/SystemUI/src/com/android/systemui/statusbar/DelegateViewHelper.java

@@ -48,7 +48,8 @@ public void setBar(BaseStatusBar phoneStatusBar) {
     }
 
     public boolean onInterceptTouchEvent(MotionEvent event) {
-        if (mSourceView == null || mDelegateView == null || mBar.shouldDisableNavbarGestures()) {
+        if (mSourceView == null || mDelegateView == null
+                || mBar.shouldDisableNavbarGestures() || mBar.inKeyguardRestrictedInputMode()) {
             return false;
         }
 

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

@@ -608,7 +608,7 @@ public void run() {
         public boolean onTouch(View v, MotionEvent event) {
             switch(event.getAction()) {
             case MotionEvent.ACTION_DOWN:
-                if (!shouldDisableNavbarGestures()) {
+                if (!shouldDisableNavbarGestures() && !inKeyguardRestrictedInputMode()) {
                     mHandler.removeCallbacks(mShowSearchPanel);
                     mHandler.postDelayed(mShowSearchPanel, mShowSearchHoldoff);
                 }

packages/SystemUI/src/com/android/systemui/statusbar/tablet/TabletStatusBar.java

@@ -201,7 +201,7 @@ public void run() {
         public boolean onTouch(View v, MotionEvent event) {
             switch(event.getAction()) {
                 case MotionEvent.ACTION_DOWN:
-                    if (!shouldDisableNavbarGestures()) {
+                    if (!shouldDisableNavbarGestures() && !inKeyguardRestrictedInputMode()) {
                         mHandler.removeCallbacks(mShowSearchPanel);
                         mHandler.postDelayed(mShowSearchPanel, mShowSearchHoldoff);
                     }