diff options
| author | Jorim Jaggi <jjaggi@google.com> | 2014-08-29 16:47:53 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-08-29 16:47:53 +0000 |
| commit | c6d25c9b8995cc20600bf5af668ecd2b0d4f9195 (patch) | |
| tree | 89812cefddc5194c61842ce1753dc13cd176844d /packages/SystemUI | |
| parent | 7a79b33039b26c9eaa32f24ef1247aa1b92962ed (diff) | |
| parent | 2cf8b71e140391b21125a39e7ed9c56c8b8d7a3e (diff) | |
| download | frameworks_base-c6d25c9b8995cc20600bf5af668ecd2b0d4f9195.zip frameworks_base-c6d25c9b8995cc20600bf5af668ecd2b0d4f9195.tar.gz frameworks_base-c6d25c9b8995cc20600bf5af668ecd2b0d4f9195.tar.bz2 | |
am 5224a3f2: Merge "Only dismiss Keyguard with space when screen is on" into lmp-dev
* commit '5224a3f29ac75dc0c9493bc45fa593dde8872b8d':
Only dismiss Keyguard with space when screen is on
Diffstat (limited to 'packages/SystemUI')
| -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; } |