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 /data | |
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 'data')
-rw-r--r-- | data/keyboards/Generic.kl | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/data/keyboards/Generic.kl b/data/keyboards/Generic.kl index 2042345..0cdcb1c 100644 --- a/data/keyboards/Generic.kl +++ b/data/keyboards/Generic.kl @@ -161,8 +161,8 @@ key 128 MEDIA_STOP key 139 MENU WAKE_DROPPED key 140 CALCULATOR # key 141 "KEY_SETUP" -key 142 POWER WAKE -key 143 POWER WAKE +key 142 SLEEP WAKE +key 143 WAKEUP WAKE # key 144 "KEY_FILE" # key 145 "KEY_SENDFILE" # key 146 "KEY_DELETEFILE" |