diff options
author | Jeff Brown <jeffbrown@google.com> | 2014-03-07 23:39:12 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2014-03-07 23:39:12 +0000 |
commit | 6f9f8e7aad2f74bc2089a081139111012e62f7db (patch) | |
tree | 926da3b8a757a337d883cd3d99f134831e4baf77 /core/res | |
parent | 8e701650179c8373a4fc5bf306befc3af2560e9d (diff) | |
parent | 01b5e765e59c14cdfb62f1a8684e9116a46874d2 (diff) | |
download | frameworks_base-6f9f8e7aad2f74bc2089a081139111012e62f7db.zip frameworks_base-6f9f8e7aad2f74bc2089a081139111012e62f7db.tar.gz frameworks_base-6f9f8e7aad2f74bc2089a081139111012e62f7db.tar.bz2 |
am 01b5e765: Merge "Declare KEYCODE_SLEEP and KEYCODE_WAKEUP." into klp-modular-dev
* commit '01b5e765e59c14cdfb62f1a8684e9116a46874d2':
Declare KEYCODE_SLEEP and KEYCODE_WAKEUP.
Diffstat (limited to 'core/res')
-rw-r--r-- | core/res/res/values/attrs.xml | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/core/res/res/values/attrs.xml b/core/res/res/values/attrs.xml index 24ebff3..1eb75d8 100644 --- a/core/res/res/values/attrs.xml +++ b/core/res/res/values/attrs.xml @@ -1571,6 +1571,8 @@ <enum name="KEYCODE_BRIGHTNESS_DOWN" value="220" /> <enum name="KEYCODE_BRIGHTNESS_UP" value="221" /> <enum name="KEYCODE_MEDIA_AUDIO_TRACK" value="222" /> + <enum name="KEYCODE_MEDIA_SLEEP" value="223" /> + <enum name="KEYCODE_MEDIA_WAKEUP" value="224" /> </attr> <!-- ***************************************************************** --> |