summaryrefslogtreecommitdiffstats
path: root/api
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 /api
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 'api')
-rw-r--r--api/current.txt4
-rw-r--r--api/system-current.txt4
2 files changed, 8 insertions, 0 deletions
diff --git a/api/current.txt b/api/current.txt
index e16294e..3dfe0cf 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 a784378..e86358f 100644
--- a/api/system-current.txt
+++ b/api/system-current.txt
@@ -37434,6 +37434,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