diff options
| author | Steve Kondik <shade@chemlab.org> | 2012-03-18 12:03:04 +0300 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@review.cyanogenmod.com> | 2012-03-18 12:03:04 +0300 |
| commit | b2afe03a5aca08d6f32145b582225e60e0a406a7 (patch) | |
| tree | 8f750cd8a524668df9b36861d0073b0b7ac82df7 | |
| parent | 9d5b96c9c7973d48c761eb90d2c074f69dad132a (diff) | |
| parent | 5b87189249a825f9a679647c40db89a4560c79e9 (diff) | |
| download | frameworks_base-b2afe03a5aca08d6f32145b582225e60e0a406a7.zip frameworks_base-b2afe03a5aca08d6f32145b582225e60e0a406a7.tar.gz frameworks_base-b2afe03a5aca08d6f32145b582225e60e0a406a7.tar.bz2 | |
Merge "Lockscreen : Fix vol wake for lockscreen security type none" into ics
| -rwxr-xr-x | policy/src/com/android/internal/policy/impl/PhoneWindowManager.java | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java b/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java index efe928e..2ba58b0 100755 --- a/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java +++ b/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java @@ -2856,16 +2856,15 @@ public class PhoneWindowManager implements WindowManagerPolicy { result = 0; final boolean isWakeKey = (policyFlags - & (WindowManagerPolicy.FLAG_WAKE | WindowManagerPolicy.FLAG_WAKE_DROPPED)) != 0 - || (((keyCode == KeyEvent.KEYCODE_VOLUME_UP) || (keyCode == KeyEvent.KEYCODE_VOLUME_DOWN)) - && mVolumeWakeScreen && !isScreenOn); + & (WindowManagerPolicy.FLAG_WAKE | WindowManagerPolicy.FLAG_WAKE_DROPPED)) != 0; + if (down && isWakeKey) { if (keyguardActive) { // If the keyguard is showing, let it decide what to do with the wake key. mKeyguardMediator.onWakeKeyWhenKeyguardShowingTq(keyCode, mDockMode != Intent.EXTRA_DOCK_STATE_UNDOCKED); - } else { + } else if ((keyCode != KeyEvent.KEYCODE_VOLUME_UP) && (keyCode != KeyEvent.KEYCODE_VOLUME_DOWN)) { // Otherwise, wake the device ourselves. result |= ACTION_POKE_USER_ACTIVITY; } @@ -2992,6 +2991,9 @@ public class PhoneWindowManager implements WindowManagerPolicy { keyCode = KeyEvent.KEYCODE_POWER; mKeyguardMediator.onWakeKeyWhenKeyguardShowingTq(keyCode, mDockMode != Intent.EXTRA_DOCK_STATE_UNDOCKED); + } else { + result |= ACTION_POKE_USER_ACTIVITY; + break; } } |