diff options
| author | Nick Armstrong-Crews <strongarm@google.com> | 2015-09-04 18:35:23 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-09-04 18:35:23 +0000 |
| commit | e097d341a46a8c40c7e9e1e7e028088b7725b243 (patch) | |
| tree | b719c91734b64d830a80c2087e9ce34a2f59b6c1 /core/java/android/view/KeyEvent.java | |
| parent | 87fc05b85d501a8221f4a3a0c97534b3160acb35 (diff) | |
| parent | 7f37402d8c5667f72c1ef02a20112d49d7a149b8 (diff) | |
am 7f37402d: am 43c4459d: am 6f0ba402: Merge "Handle KEYCODE_SOFT_SLEEP from Ungaze." into cw-e-dev
* commit '7f37402d8c5667f72c1ef02a20112d49d7a149b8':
Handle KEYCODE_SOFT_SLEEP from Ungaze.
Diffstat (limited to 'core/java/android/view/KeyEvent.java')
| -rw-r--r-- | core/java/android/view/KeyEvent.java | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/core/java/android/view/KeyEvent.java b/core/java/android/view/KeyEvent.java index 6d898240cc90..1c20cab55a5d 100644 --- a/core/java/android/view/KeyEvent.java +++ b/core/java/android/view/KeyEvent.java @@ -788,8 +788,10 @@ public class KeyEvent extends InputEvent implements Parcelable { /** Key code constant: Step backward media key. * Steps media backward, one frame at a time. */ public static final int KEYCODE_MEDIA_STEP_BACKWARD = 275; + /** Key code constant: put device to sleep unless a wakelock is held. */ + public static final int KEYCODE_SOFT_SLEEP = 276; - private static final int LAST_KEYCODE = KEYCODE_MEDIA_STEP_BACKWARD; + private static final int LAST_KEYCODE = KEYCODE_SOFT_SLEEP; // NOTE: If you add a new keycode here you must also add it to: // isSystem() |