summaryrefslogtreecommitdiffstats
path: root/emulator
diff options
context:
space:
mode:
authorAndy Stadler <>2009-04-10 16:24:46 -0700
committerThe Android Open Source Project <initial-contribution@android.com>2009-04-10 16:24:46 -0700
commite1a5a9bf5d216c22a2960ba78455f70bf761336e (patch)
tree43254e6d5b22231497dc6c975c02d7d232828f56 /emulator
parenta3ebac2c53d453daa4ebaa2d21ce4e1afcaecb4e (diff)
downloadandroid_development-e1a5a9bf5d216c22a2960ba78455f70bf761336e.tar.gz
android_development-e1a5a9bf5d216c22a2960ba78455f70bf761336e.tar.bz2
android_development-e1a5a9bf5d216c22a2960ba78455f70bf761336e.zip
AI 145778: Manual merge changes 145382-145384 from cupcake.
Automated import of CL 145778
Diffstat (limited to 'emulator')
-rw-r--r--emulator/keymaps/AVRCP.kl13
1 files changed, 6 insertions, 7 deletions
diff --git a/emulator/keymaps/AVRCP.kl b/emulator/keymaps/AVRCP.kl
index 175824ef7..d0eba109d 100644
--- a/emulator/keymaps/AVRCP.kl
+++ b/emulator/keymaps/AVRCP.kl
@@ -1,7 +1,6 @@
-key 164 PLAYPAUSE WAKE
-key 128 STOP WAKE
-key 163 NEXTSONG WAKE
-key 165 PREVIOUSSONG WAKE
-key 168 REWIND WAKE
-key 159 FORWARD WAKE
-
+key 164 MEDIA_PLAY_PAUSE WAKE
+key 128 MEDIA_STOP WAKE
+key 163 MEDIA_NEXT WAKE
+key 165 MEDIA_PREVIOUS WAKE
+key 168 MEDIA_REWIND WAKE
+key 159 MEDIA_FAST_FORWARD WAKE