diff options
| author | Nick Armstrong-Crews <strongarm@google.com> | 2015-09-04 18:16:12 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-09-04 18:16:12 +0000 |
| commit | 8d13427f6febd7a2abf3946a21dd826d55791f21 (patch) | |
| tree | d95dfc3ee3dc8e02b69813e65d8d39a7e9fd590c | |
| parent | e5ce0db83355bd2c8f3d265e3e254c22c6a61cd4 (diff) | |
| parent | 3c8a147c8394a32217bb65672387d69a49a31270 (diff) | |
| download | frameworks_native-8d13427f6febd7a2abf3946a21dd826d55791f21.zip frameworks_native-8d13427f6febd7a2abf3946a21dd826d55791f21.tar.gz frameworks_native-8d13427f6febd7a2abf3946a21dd826d55791f21.tar.bz2 | |
am 3c8a147c: Merge "Add KEYCODE_SOFT_SLEEP for Ungaze." into cw-e-dev
* commit '3c8a147c8394a32217bb65672387d69a49a31270':
Add KEYCODE_SOFT_SLEEP for Ungaze.
| -rw-r--r-- | include/android/keycodes.h | 4 | ||||
| -rw-r--r-- | include/input/InputEventLabels.h | 1 |
2 files changed, 4 insertions, 1 deletions
diff --git a/include/android/keycodes.h b/include/android/keycodes.h index 1f55d9f..421abe5 100644 --- a/include/android/keycodes.h +++ b/include/android/keycodes.h @@ -735,7 +735,9 @@ enum { AKEYCODE_MEDIA_SKIP_FORWARD = 272, AKEYCODE_MEDIA_SKIP_BACKWARD = 273, AKEYCODE_MEDIA_STEP_FORWARD = 274, - AKEYCODE_MEDIA_STEP_BACKWARD = 275 + AKEYCODE_MEDIA_STEP_BACKWARD = 275, + /** Put device to sleep unless a wakelock is held. */ + AKEYCODE_SOFT_SLEEP = 276 // NOTE: If you add a new keycode here you must also add it to several other files. // Refer to frameworks/base/core/java/android/view/KeyEvent.java for the full list. diff --git a/include/input/InputEventLabels.h b/include/input/InputEventLabels.h index 344f2f3..f0a6238 100644 --- a/include/input/InputEventLabels.h +++ b/include/input/InputEventLabels.h @@ -311,6 +311,7 @@ static const InputEventLabel KEYCODES[] = { DEFINE_KEYCODE(MEDIA_SKIP_BACKWARD), DEFINE_KEYCODE(MEDIA_STEP_FORWARD), DEFINE_KEYCODE(MEDIA_STEP_BACKWARD), + DEFINE_KEYCODE(SOFT_SLEEP), { NULL, 0 } }; |