summaryrefslogtreecommitdiff
path: root/phone/com/android/internal/policy/impl/PhoneWindow.java
diff options
context:
space:
mode:
authorAndy Stadler <>2009-04-10 16:24:49 -0700
committerThe Android Open Source Project <initial-contribution@android.com>2009-04-10 16:24:49 -0700
commit4ea45182a1239fb75ac3c9e92032b43365081cf1 (patch)
treee8275c72741c9ecb2a94852115afa009123c733c /phone/com/android/internal/policy/impl/PhoneWindow.java
parent6538aeb517c71e94373139dc3a50f34d02875cb9 (diff)
downloadbase-4ea45182a1239fb75ac3c9e92032b43365081cf1.tar.gz
AI 145778: Manual merge changes 145382-145384 from cupcake.
Automated import of CL 145778
Diffstat (limited to 'phone/com/android/internal/policy/impl/PhoneWindow.java')
-rw-r--r--phone/com/android/internal/policy/impl/PhoneWindow.java24
1 files changed, 12 insertions, 12 deletions
diff --git a/phone/com/android/internal/policy/impl/PhoneWindow.java b/phone/com/android/internal/policy/impl/PhoneWindow.java
index 8d9a733..da92275 100644
--- a/phone/com/android/internal/policy/impl/PhoneWindow.java
+++ b/phone/com/android/internal/policy/impl/PhoneWindow.java
@@ -1230,7 +1230,7 @@ public class PhoneWindow extends Window implements MenuBuilder.Callback {
}
- case KeyEvent.KEYCODE_PLAYPAUSE:
+ case KeyEvent.KEYCODE_MEDIA_PLAY_PAUSE:
/* Suppress PLAYPAUSE toggle when phone is ringing or in-call
* to avoid music playback */
if (mTelephonyManager == null) {
@@ -1243,11 +1243,11 @@ public class PhoneWindow 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);
@@ -1370,12 +1370,12 @@ public class PhoneWindow 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);