summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorDianne Hackborn <>2009-04-09 12:31:13 -0700
committerThe Android Open Source Project <initial-contribution@android.com>2009-04-09 12:31:13 -0700
commit5eabbd9f27b5684508b5f5f1f99030c67984ae81 (patch)
treece5a74bab92023e7b3a49564183468a111bf51ca /include
parentd6fbffe6eabd7e910507f85853e1bc797a3c5d6d (diff)
downloadframeworks_base-5eabbd9f27b5684508b5f5f1f99030c67984ae81.zip
frameworks_base-5eabbd9f27b5684508b5f5f1f99030c67984ae81.tar.gz
frameworks_base-5eabbd9f27b5684508b5f5f1f99030c67984ae81.tar.bz2
AI 145382: API review: change new media keycode names to avoid ambiguity.
Updates the key maps. During this I noticed that the dream keymap didn't have all of the media buttons like the sapphire key map...! So this is now changed to match. BUG=1779435 Automated import of CL 145382
Diffstat (limited to 'include')
-rw-r--r--include/ui/KeycodeLabels.h12
1 files changed, 6 insertions, 6 deletions
diff --git a/include/ui/KeycodeLabels.h b/include/ui/KeycodeLabels.h
index efa6d2b..571e47b 100644
--- a/include/ui/KeycodeLabels.h
+++ b/include/ui/KeycodeLabels.h
@@ -107,12 +107,12 @@ static const KeycodeLabel KEYCODES[] = {
{ "MENU", 82 },
{ "NOTIFICATION", 83 },
{ "SEARCH", 84 },
- { "PLAYPAUSE", 85 },
- { "STOP", 86 },
- { "NEXTSONG", 87 },
- { "PREVIOUSSONG", 88 },
- { "REWIND", 89 },
- { "FORWARD", 90 },
+ { "MEDIA_PLAY_PAUSE", 85 },
+ { "MEDIA_STOP", 86 },
+ { "MEDIA_NEXT", 87 },
+ { "MEDIA_PREVIOUS", 88 },
+ { "MEDIA_REWIND", 89 },
+ { "MEDIA_FAST_FORWARD", 90 },
{ "MUTE", 91 },
// NOTE: If you add a new keycode here you must also add it to: