commit 67ad368d4d549b431d826936e40a679099fefec8
author John Spurlock <jspurlock@google.com> Tue Jun 26 17:42:00 2012 -0400
committer John Spurlock <jspurlock@google.com> Wed Jun 27 09:32:55 2012 -0400
tree 95ee8c181e3348a40a40fa4a0c1c62c4d7cd05e4
parent b6d148d02a9764abd40af50b096599bb148571b3

Disable assist gesture when keyguard is active

Prevent search gesture from firing when keyguard is in restricted input mode,
e.g. in Emergency Dialer. Also disable the Home touch listener in this mode to
avoid bringing up the ring.  Affects both phone and tablets.

Bug: 6723749
Change-Id: I60f0aebfcce4cf7f66798ee1212ea326bdad3ef0

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

diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/BaseStatusBar.java b/packages/SystemUI/src/com/android/systemui/statusbar/BaseStatusBar.java
index 04cff96..0866d18 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/BaseStatusBar.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/BaseStatusBar.java
@@ -953,4 +953,9 @@
         }
         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

diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/DelegateViewHelper.java b/packages/SystemUI/src/com/android/systemui/statusbar/DelegateViewHelper.java
index 96afbb6..4f33e23 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/DelegateViewHelper.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/DelegateViewHelper.java
@@ -48,7 +48,8 @@
     }
 
     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

diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java
index eff6061..c0838c2 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java
@@ -608,7 +608,7 @@
         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

diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/tablet/TabletStatusBar.java b/packages/SystemUI/src/com/android/systemui/statusbar/tablet/TabletStatusBar.java
index 29d8c98..5cab636 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/tablet/TabletStatusBar.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/tablet/TabletStatusBar.java
@@ -201,7 +201,7 @@
         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);
                     }