summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
author Andy Stadler <> 2009-04-10 16:24:47 -0700
committer The Android Open Source Project <initial-contribution@android.com> 2009-04-10 16:24:47 -0700
commitbc0caf802e5eb08b6565bbe3a535cb2fca826d8b (patch)
tree381d9f9cc7f7ab5845d1c522cf7954dc27930259 /include
parentc8938682271b09f8a07144c206de02383d67398c (diff)
AI 145778: Manual merge changes 145382-145384 from cupcake.
Automated import of CL 145778
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 efa6d2bdd3..571e47b22d 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: