From 2c33d5dcae50ab1a2a6baa765ebe999a12bb7047 Mon Sep 17 00:00:00 2001 From: Jorim Jaggi Date: Fri, 29 Aug 2014 16:28:20 +0200 Subject: Only dismiss Keyguard with space when screen is on Bug: 17206291 Change-Id: I7fd9c77a0810bb71c0e4193ab121398e8e78d43b --- .../src/com/android/systemui/statusbar/phone/PhoneStatusBar.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'packages/SystemUI') 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 9fd3d9c..cd0fb6f 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java @@ -3612,7 +3612,8 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode, } public boolean onSpacePressed() { - if (mState == StatusBarState.KEYGUARD || mState == StatusBarState.SHADE_LOCKED) { + if (mScreenOn != null && mScreenOn + && (mState == StatusBarState.KEYGUARD || mState == StatusBarState.SHADE_LOCKED)) { animateCollapsePanels(0 /* flags */, true /* force */); return true; } -- cgit v1.1