diff options
| author | Michael Wright <michaelwr@google.com> | 2015-08-07 16:52:27 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-08-07 16:52:27 +0000 |
| commit | d7255cfb1cf8dc7249632d93d68daac8cc2c7b9c (patch) | |
| tree | 45298f2ad7e29c1762b015e602cfbb5ee0b1dcf3 | |
| parent | 38d30dc547825bdde2756f588692063a28749e8d (diff) | |
| parent | 600b9847605489494149c519a9eea25e4d512744 (diff) | |
| download | frameworks_base-d7255cfb1cf8dc7249632d93d68daac8cc2c7b9c.zip frameworks_base-d7255cfb1cf8dc7249632d93d68daac8cc2c7b9c.tar.gz frameworks_base-d7255cfb1cf8dc7249632d93d68daac8cc2c7b9c.tar.bz2 | |
Merge "DO NOT MERGE. Add new media navigation keys." into mnc-dev
| -rw-r--r-- | api/current.txt | 4 | ||||
| -rw-r--r-- | api/system-current.txt | 4 | ||||
| -rw-r--r-- | core/java/android/view/KeyEvent.java | 22 | ||||
| -rw-r--r-- | core/res/res/values/attrs.xml | 4 |
4 files changed, 28 insertions, 6 deletions
diff --git a/api/current.txt b/api/current.txt index ac34c59..e295a63 100644 --- a/api/current.txt +++ b/api/current.txt @@ -35140,6 +35140,10 @@ package android.view { field public static final int KEYCODE_MEDIA_PREVIOUS = 88; // 0x58 field public static final int KEYCODE_MEDIA_RECORD = 130; // 0x82 field public static final int KEYCODE_MEDIA_REWIND = 89; // 0x59 + field public static final int KEYCODE_MEDIA_SKIP_BACKWARD = 273; // 0x111 + field public static final int KEYCODE_MEDIA_SKIP_FORWARD = 272; // 0x110 + field public static final int KEYCODE_MEDIA_STEP_BACKWARD = 275; // 0x113 + field public static final int KEYCODE_MEDIA_STEP_FORWARD = 274; // 0x112 field public static final int KEYCODE_MEDIA_STOP = 86; // 0x56 field public static final int KEYCODE_MEDIA_TOP_MENU = 226; // 0xe2 field public static final int KEYCODE_MENU = 82; // 0x52 diff --git a/api/system-current.txt b/api/system-current.txt index 001a242..8b9af5e 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -37432,6 +37432,10 @@ package android.view { field public static final int KEYCODE_MEDIA_PREVIOUS = 88; // 0x58 field public static final int KEYCODE_MEDIA_RECORD = 130; // 0x82 field public static final int KEYCODE_MEDIA_REWIND = 89; // 0x59 + field public static final int KEYCODE_MEDIA_SKIP_BACKWARD = 273; // 0x111 + field public static final int KEYCODE_MEDIA_SKIP_FORWARD = 272; // 0x110 + field public static final int KEYCODE_MEDIA_STEP_BACKWARD = 275; // 0x113 + field public static final int KEYCODE_MEDIA_STEP_FORWARD = 274; // 0x112 field public static final int KEYCODE_MEDIA_STOP = 86; // 0x56 field public static final int KEYCODE_MEDIA_TOP_MENU = 226; // 0xe2 field public static final int KEYCODE_MENU = 82; // 0x52 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() diff --git a/core/res/res/values/attrs.xml b/core/res/res/values/attrs.xml index b1925ba..67abe8d 100644 --- a/core/res/res/values/attrs.xml +++ b/core/res/res/values/attrs.xml @@ -1806,6 +1806,10 @@ i <enum name="KEYCODE_NAVIGATE_NEXT" value="261" /> <enum name="KEYCODE_NAVIGATE_IN" value="262" /> <enum name="KEYCODE_NAVIGATE_OUT" value="263" /> + <enum name="KEYCODE_MEDIA_SKIP_FORWARD" value="272" /> + <enum name="KEYCODE_MEDIA_SKIP_BACKWARD" value="273" /> + <enum name="KEYCODE_MEDIA_STEP_FORWARD" value="274" /> + <enum name="KEYCODE_MEDIA_STEP_BACKWARD" value="275" /> </attr> <!-- ***************************************************************** --> |