AI 145778: Manual merge changes 145382-145384 from cupcake.

Automated import of CL 145778

diff --git a/src/com/android/music/MediaButtonIntentReceiver.java b/src/com/android/music/MediaButtonIntentReceiver.java
index 76812df..44d76db 100644 (file)
--- a/src/com/android/music/MediaButtonIntentReceiver.java
+++ b/src/com/android/music/MediaButtonIntentReceiver.java
@@ -85,17 +85,17 @@ public class MediaButtonIntentReceiver extends BroadcastReceiver {
             
             String command = null;
             switch (keycode) {
-                case KeyEvent.KEYCODE_STOP:
+                case KeyEvent.KEYCODE_MEDIA_STOP:
                     command = MediaPlaybackService.CMDSTOP;
                     break;
                 case KeyEvent.KEYCODE_HEADSETHOOK:
-                case KeyEvent.KEYCODE_PLAYPAUSE:
+                case KeyEvent.KEYCODE_MEDIA_PLAY_PAUSE:
                     command = MediaPlaybackService.CMDTOGGLEPAUSE;
                     break;
-                case KeyEvent.KEYCODE_NEXTSONG:
+                case KeyEvent.KEYCODE_MEDIA_NEXT:
                     command = MediaPlaybackService.CMDNEXT;
                     break;
-                case KeyEvent.KEYCODE_PREVIOUSSONG:
+                case KeyEvent.KEYCODE_MEDIA_PREVIOUS:
                     command = MediaPlaybackService.CMDPREVIOUS;
                     break;
             }