am 3c8a147c: Merge "Add KEYCODE_SOFT_SLEEP for Ungaze." into cw-e-dev

* commit '3c8a147c8394a32217bb65672387d69a49a31270':
  Add KEYCODE_SOFT_SLEEP for Ungaze.
This commit is contained in:
Nick Armstrong-Crews 2015-09-04 18:16:12 +00:00 committed by Android Git Automerger
commit 8d13427f6f
2 changed files with 4 additions and 1 deletions

View File

@ -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.

View File

@ -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 }
};