From bc0caf802e5eb08b6565bbe3a535cb2fca826d8b Mon Sep 17 00:00:00 2001
From: Andy Stadler <>
Date: Fri, 10 Apr 2009 16:24:47 -0700
Subject: AI 145778: Manual merge changes 145382-145384 from cupcake.

Automated import of CL 145778
---
 include/ui/KeycodeLabels.h | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'include')

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:
-- 
cgit v1.2.3-59-g8ed1b