summaryrefslogtreecommitdiffstats
path: root/packages/SystemUI/src/com/android/systemui/statusbar/DelegateViewHelper.java
diff options
context:
space:
mode:
authorDaniel Sandler <dsandler@android.com>2012-10-22 07:59:17 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2012-10-22 07:59:18 -0700
commit2dd0c3a576925be4b5f0438a57af626e6e162e0e (patch)
tree30fe4aa5001fb27829f8b7ba9736b62d8e93e22b /packages/SystemUI/src/com/android/systemui/statusbar/DelegateViewHelper.java
parent8074e98b20ac04fdc032a1ed00dd6763b7e04147 (diff)
parentd5483c3157a28e2ebc05a0c918df8a2be0a7fc89 (diff)
downloadframeworks_base-2dd0c3a576925be4b5f0438a57af626e6e162e0e.zip
frameworks_base-2dd0c3a576925be4b5f0438a57af626e6e162e0e.tar.gz
frameworks_base-2dd0c3a576925be4b5f0438a57af626e6e162e0e.tar.bz2
Merge "New lockscreen: allow search gesture from nav bar." into jb-mr1-dev
Diffstat (limited to 'packages/SystemUI/src/com/android/systemui/statusbar/DelegateViewHelper.java')
-rw-r--r--packages/SystemUI/src/com/android/systemui/statusbar/DelegateViewHelper.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/DelegateViewHelper.java b/packages/SystemUI/src/com/android/systemui/statusbar/DelegateViewHelper.java
index 4f33e23..3ac1bcf 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/DelegateViewHelper.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/DelegateViewHelper.java
@@ -49,7 +49,7 @@ public class DelegateViewHelper {
public boolean onInterceptTouchEvent(MotionEvent event) {
if (mSourceView == null || mDelegateView == null
- || mBar.shouldDisableNavbarGestures() || mBar.inKeyguardRestrictedInputMode()) {
+ || mBar.shouldDisableNavbarGestures()) {
return false;
}