diff options
| author | Jeff Brown <jeffbrown@google.com> | 2014-03-08 05:43:12 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-03-08 05:43:12 +0000 |
| commit | 2901e0442ab63d3148b708e88f445acaf8d4dc15 (patch) | |
| tree | ec75aa690f1c44bc9ef569aa94b74dbd3109ce43 /policy | |
| parent | edb35cf57c20ba7dfb89a31a02ecf5d4de772fe2 (diff) | |
| parent | 9e3de5f70d77f7152b25fec6c27b73d037c1376d (diff) | |
| download | frameworks_base-2901e0442ab63d3148b708e88f445acaf8d4dc15.zip frameworks_base-2901e0442ab63d3148b708e88f445acaf8d4dc15.tar.gz frameworks_base-2901e0442ab63d3148b708e88f445acaf8d4dc15.tar.bz2 | |
am 9e3de5f7: am 6f9f8e7a: am 01b5e765: Merge "Declare KEYCODE_SLEEP and KEYCODE_WAKEUP." into klp-modular-dev
* commit '9e3de5f70d77f7152b25fec6c27b73d037c1376d':
Declare KEYCODE_SLEEP and KEYCODE_WAKEUP.
Diffstat (limited to 'policy')
| -rw-r--r-- | policy/src/com/android/internal/policy/impl/PhoneWindowManager.java | 16 |
1 files changed, 15 insertions, 1 deletions
diff --git a/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java b/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java index 17a0e60..9ecb917 100644 --- a/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java +++ b/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java @@ -3809,7 +3809,9 @@ public class PhoneWindowManager implements WindowManagerPolicy { mKeyguardDelegate.isShowingAndNotHidden() : mKeyguardDelegate.isShowing())); - if (keyCode == KeyEvent.KEYCODE_POWER) { + if (keyCode == KeyEvent.KEYCODE_POWER + || keyCode == KeyEvent.KEYCODE_SLEEP + || keyCode == KeyEvent.KEYCODE_WAKEUP) { policyFlags |= WindowManagerPolicy.FLAG_WAKE; } @@ -4009,6 +4011,18 @@ public class PhoneWindowManager implements WindowManagerPolicy { break; } + case KeyEvent.KEYCODE_SLEEP: { + result &= ~ACTION_PASS_TO_USER; + mPowerManager.goToSleep(event.getEventTime()); + isWakeKey = false; + break; + } + + case KeyEvent.KEYCODE_WAKEUP: { + result &= ~ACTION_PASS_TO_USER; + break; + } + case KeyEvent.KEYCODE_MEDIA_PLAY: case KeyEvent.KEYCODE_MEDIA_PAUSE: case KeyEvent.KEYCODE_MEDIA_PLAY_PAUSE: |