diff options
| author | Andy Stadler <> | 2009-04-10 16:24:49 -0700 |
|---|---|---|
| committer | The Android Open Source Project <initial-contribution@android.com> | 2009-04-10 16:24:49 -0700 |
| commit | 4ea45182a1239fb75ac3c9e92032b43365081cf1 (patch) | |
| tree | e8275c72741c9ecb2a94852115afa009123c733c /mid/com/android/internal/policy | |
| parent | 6538aeb517c71e94373139dc3a50f34d02875cb9 (diff) | |
| download | base-4ea45182a1239fb75ac3c9e92032b43365081cf1.tar.gz | |
AI 145778: Manual merge changes 145382-145384 from cupcake.
Automated import of CL 145778
Diffstat (limited to 'mid/com/android/internal/policy')
| -rw-r--r-- | mid/com/android/internal/policy/impl/MidWindow.java | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/mid/com/android/internal/policy/impl/MidWindow.java b/mid/com/android/internal/policy/impl/MidWindow.java index 536ee65..68727fb 100644 --- a/mid/com/android/internal/policy/impl/MidWindow.java +++ b/mid/com/android/internal/policy/impl/MidWindow.java @@ -1120,7 +1120,7 @@ public class MidWindow extends Window implements MenuBuilder.Callback { return true; } - case KeyEvent.KEYCODE_PLAYPAUSE: + case KeyEvent.KEYCODE_MEDIA_PLAY_PAUSE: /* Suppress PLAYPAUSE toggle if Phone is ringing or in-call, * to avoid music playback */ if (mTelephonyManager == null) { @@ -1133,11 +1133,11 @@ public class MidWindow extends Window implements MenuBuilder.Callback { } case KeyEvent.KEYCODE_MUTE: case KeyEvent.KEYCODE_HEADSETHOOK: - case KeyEvent.KEYCODE_STOP: - case KeyEvent.KEYCODE_NEXTSONG: - case KeyEvent.KEYCODE_PREVIOUSSONG: - case KeyEvent.KEYCODE_REWIND: - case KeyEvent.KEYCODE_FORWARD: { + case KeyEvent.KEYCODE_MEDIA_STOP: + case KeyEvent.KEYCODE_MEDIA_NEXT: + case KeyEvent.KEYCODE_MEDIA_PREVIOUS: + case KeyEvent.KEYCODE_MEDIA_REWIND: + case KeyEvent.KEYCODE_MEDIA_FAST_FORWARD: { Intent intent = new Intent(Intent.ACTION_MEDIA_BUTTON, null); intent.putExtra(Intent.EXTRA_KEY_EVENT, event); getContext().sendOrderedBroadcast(intent, null); @@ -1247,12 +1247,12 @@ public class MidWindow extends Window implements MenuBuilder.Callback { } case KeyEvent.KEYCODE_HEADSETHOOK: - case KeyEvent.KEYCODE_PLAYPAUSE: - case KeyEvent.KEYCODE_STOP: - case KeyEvent.KEYCODE_NEXTSONG: - case KeyEvent.KEYCODE_PREVIOUSSONG: - case KeyEvent.KEYCODE_REWIND: - case KeyEvent.KEYCODE_FORWARD: { + case KeyEvent.KEYCODE_MEDIA_PLAY_PAUSE: + case KeyEvent.KEYCODE_MEDIA_STOP: + case KeyEvent.KEYCODE_MEDIA_NEXT: + case KeyEvent.KEYCODE_MEDIA_PREVIOUS: + case KeyEvent.KEYCODE_MEDIA_REWIND: + case KeyEvent.KEYCODE_MEDIA_FAST_FORWARD: { Intent intent = new Intent(Intent.ACTION_MEDIA_BUTTON, null); intent.putExtra(Intent.EXTRA_KEY_EVENT, event); getContext().sendOrderedBroadcast(intent, null); |