drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
John Spurlock
2012-06-27 13:27:09 -07:00
committed by Android (Google) Code Review
parent fec0c188ff 67ad368d4d
commit c6a2fa8cba
4 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
packages/SystemUI/src/com/android/systemui/statusbar/BaseStatusBar.java
View File

@ -953,4 +953,9 @@ public abstract class BaseStatusBar extends SystemUI implements
} }
return false; return false;
} }
public boolean inKeyguardRestrictedInputMode() {
KeyguardManager km = (KeyguardManager) mContext.getSystemService(Context.KEYGUARD_SERVICE);
return km.inKeyguardRestrictedInputMode();
}
} }

3
packages/SystemUI/src/com/android/systemui/statusbar/DelegateViewHelper.java
View File

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

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

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

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

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