summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorThe Android Open Source Project <initial-contribution@android.com>2009-04-14 18:18:03 -0700
committerThe Android Open Source Project <initial-contribution@android.com>2009-04-14 18:18:03 -0700
commit5e8c31ac31107c0cbc4a103e4f62342b07b5876b (patch)
tree7f030540c23ccbe90b9ba0df9990b00126104e3f /include
parent37f8ca1e33a7e92f134344b26780e9a8e0329287 (diff)
parent5671777ecb3f9047f5546336a724e5b97bc3dbe0 (diff)
downloadframeworks_base-5e8c31ac31107c0cbc4a103e4f62342b07b5876b.zip
frameworks_base-5e8c31ac31107c0cbc4a103e4f62342b07b5876b.tar.gz
frameworks_base-5e8c31ac31107c0cbc4a103e4f62342b07b5876b.tar.bz2
Merge commit 'korg/cupcake'
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: