summaryrefslogtreecommitdiffstats
path: root/core/res
diff options
context:
space:
mode:
authorMichael Wright <michaelwr@google.com>2015-08-07 16:52:27 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2015-08-07 16:52:27 +0000
commitd7255cfb1cf8dc7249632d93d68daac8cc2c7b9c (patch)
tree45298f2ad7e29c1762b015e602cfbb5ee0b1dcf3 /core/res
parent38d30dc547825bdde2756f588692063a28749e8d (diff)
parent600b9847605489494149c519a9eea25e4d512744 (diff)
downloadframeworks_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 'core/res')
-rw-r--r--core/res/res/values/attrs.xml4
1 files changed, 4 insertions, 0 deletions
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>
<!-- ***************************************************************** -->