summaryrefslogtreecommitdiffstats
path: root/core/java/android/view
diff options
context:
space:
mode:
authorMichael Wright <michaelwr@google.com>2015-08-06 15:16:22 +0100
committerMichael Wright <michaelwr@google.com>2015-08-07 14:46:05 +0100
commit600b9847605489494149c519a9eea25e4d512744 (patch)
tree28fd4d7158af9ebb6717a0e62225754a31c7b2fd /core/java/android/view
parent2ccf0c8e636fd3be75c3a07f4cf60d72a4cfaa28 (diff)
downloadframeworks_base-600b9847605489494149c519a9eea25e4d512744.zip
frameworks_base-600b9847605489494149c519a9eea25e4d512744.tar.gz
frameworks_base-600b9847605489494149c519a9eea25e4d512744.tar.bz2
DO NOT MERGE. Add new media navigation keys.
Bug: 22059484 Change-Id: Ifd8fd18178fed45ead2980b957dd1d177e40f165
Diffstat (limited to 'core/java/android/view')
-rw-r--r--core/java/android/view/KeyEvent.java22
1 files changed, 16 insertions, 6 deletions
diff --git a/core/java/android/view/KeyEvent.java b/core/java/android/view/KeyEvent.java
index f6ce353..a9bf92b 100644
--- a/core/java/android/view/KeyEvent.java
+++ b/core/java/android/view/KeyEvent.java
@@ -747,22 +747,32 @@ public class KeyEvent extends InputEvent implements Parcelable {
public static final int KEYCODE_TV_TIMER_PROGRAMMING = 258;
/** Key code constant: Help key. */
public static final int KEYCODE_HELP = 259;
- /** Key code constant: Navigate to previous key.
+ /** Key code constant: Navigate to previous key.
* Goes backward by one item in an ordered collection of items. */
public static final int KEYCODE_NAVIGATE_PREVIOUS = 260;
- /** Key code constant: Navigate to next key.
+ /** Key code constant: Navigate to next key.
* Advances to the next item in an ordered collection of items. */
public static final int KEYCODE_NAVIGATE_NEXT = 261;
/** Key code constant: Navigate in key.
- * Activates the item that currently has focus or expands to the next level of a navigation
+ * Activates the item that currently has focus or expands to the next level of a navigation
* hierarchy. */
public static final int KEYCODE_NAVIGATE_IN = 262;
/** Key code constant: Navigate out key.
- * Backs out one level of a navigation hierarchy or collapses the item that currently has
+ * Backs out one level of a navigation hierarchy or collapses the item that currently has
* focus. */
public static final int KEYCODE_NAVIGATE_OUT = 263;
-
- private static final int LAST_KEYCODE = KEYCODE_NAVIGATE_OUT;
+ /** Key code constant: Skip forward media key. */
+ public static final int KEYCODE_MEDIA_SKIP_FORWARD = 272;
+ /** Key code constant: Skip backward media key. */
+ public static final int KEYCODE_MEDIA_SKIP_BACKWARD = 273;
+ /** Key code constant: Step forward media key.
+ * Steps media forward, one frame at a time. */
+ public static final int KEYCODE_MEDIA_STEP_FORWARD = 274;
+ /** Key code constant: Step backward media key.
+ * Steps media backward, one frame at a time. */
+ public static final int KEYCODE_MEDIA_STEP_BACKWARD = 275;
+
+ private static final int LAST_KEYCODE = KEYCODE_MEDIA_STEP_BACKWARD;
// NOTE: If you add a new keycode here you must also add it to:
// isSystem()