diff options
| author | Andy Stadler <> | 2009-04-10 16:24:47 -0700 |
|---|---|---|
| committer | The Android Open Source Project <initial-contribution@android.com> | 2009-04-10 16:24:47 -0700 |
| commit | f8a7ceaef2e7d5cd530c9426bde91b6fa9a40b75 (patch) | |
| tree | 1dd68eeddbfa83d571a3544d6d2e25ba9be21b49 /core/java/android/widget/MediaController.java | |
| parent | 1eb75a0b3770177c3f0d0c2e843f80fc34451ef5 (diff) | |
| download | frameworks_base-f8a7ceaef2e7d5cd530c9426bde91b6fa9a40b75.zip frameworks_base-f8a7ceaef2e7d5cd530c9426bde91b6fa9a40b75.tar.gz frameworks_base-f8a7ceaef2e7d5cd530c9426bde91b6fa9a40b75.tar.bz2 | |
AI 145778: Manual merge changes 145382-145384 from cupcake.
Automated import of CL 145778
Diffstat (limited to 'core/java/android/widget/MediaController.java')
| -rw-r--r-- | core/java/android/widget/MediaController.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/core/java/android/widget/MediaController.java b/core/java/android/widget/MediaController.java index a2ec83f..b162a0e 100644 --- a/core/java/android/widget/MediaController.java +++ b/core/java/android/widget/MediaController.java @@ -388,12 +388,12 @@ public class MediaController extends FrameLayout { int keyCode = event.getKeyCode(); if (event.getRepeatCount() == 0 && event.isDown() && ( keyCode == KeyEvent.KEYCODE_HEADSETHOOK || - keyCode == KeyEvent.KEYCODE_PLAYPAUSE || + keyCode == KeyEvent.KEYCODE_MEDIA_PLAY_PAUSE || keyCode == KeyEvent.KEYCODE_SPACE)) { doPauseResume(); show(sDefaultTimeout); return true; - } else if (keyCode == KeyEvent.KEYCODE_STOP) { + } else if (keyCode == KeyEvent.KEYCODE_MEDIA_STOP) { if (mPlayer.isPlaying()) { mPlayer.pause(); updatePausePlay(); |