diff options
| author | Jorim Jaggi <jjaggi@google.com> | 2014-08-29 16:42:00 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-08-29 16:42:01 +0000 |
| commit | 2cf8b71e140391b21125a39e7ed9c56c8b8d7a3e (patch) | |
| tree | 1b4d362e89c304d7a90f8048bb4d109211abe729 /packages | |
| parent | 6b58ab58096fb6254a54584ace23c9f892435db9 (diff) | |
| parent | 2c33d5dcae50ab1a2a6baa765ebe999a12bb7047 (diff) | |
| download | frameworks_base-2cf8b71e140391b21125a39e7ed9c56c8b8d7a3e.zip frameworks_base-2cf8b71e140391b21125a39e7ed9c56c8b8d7a3e.tar.gz frameworks_base-2cf8b71e140391b21125a39e7ed9c56c8b8d7a3e.tar.bz2 | |
Merge "Only dismiss Keyguard with space when screen is on" into lmp-dev
Diffstat (limited to 'packages')
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java | 3 |
1 files changed, 2 insertions, 1 deletions
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; } |