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 /api | |
| 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
Diffstat (limited to 'api')
| -rw-r--r-- | api/current.txt | 4 | ||||
| -rw-r--r-- | api/system-current.txt | 4 |
2 files changed, 8 insertions, 0 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 |