diff options
| author | The Android Open Source Project <initial-contribution@android.com> | 2009-01-20 14:03:58 -0800 |
|---|---|---|
| committer | The Android Open Source Project <initial-contribution@android.com> | 2009-01-20 14:03:58 -0800 |
| commit | 22f7dfd23490a3de2f21ff96949ba47003aac8f8 (patch) | |
| tree | 41bc290bb2f1f08a0e37cfda4955742a85d42ecf /core/java/android/widget/VideoView.java | |
| parent | 9266c558bf1d21ff647525ff99f7dadbca417309 (diff) | |
auto import from //branches/cupcake/...@127101
Diffstat (limited to 'core/java/android/widget/VideoView.java')
| -rw-r--r-- | core/java/android/widget/VideoView.java | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/core/java/android/widget/VideoView.java b/core/java/android/widget/VideoView.java index df4015670bd6..1227afd9c186 100644 --- a/core/java/android/widget/VideoView.java +++ b/core/java/android/widget/VideoView.java @@ -447,7 +447,8 @@ public class VideoView extends SurfaceView implements MediaPlayerControl { keyCode != KeyEvent.KEYCODE_ENDCALL && mMediaPlayer != null && mMediaController != null) { - if (keyCode == KeyEvent.KEYCODE_HEADSETHOOK) { + if (keyCode == KeyEvent.KEYCODE_HEADSETHOOK || + keyCode == KeyEvent.KEYCODE_PLAYPAUSE) { if (mMediaPlayer.isPlaying()) { pause(); mMediaController.show(); @@ -456,6 +457,10 @@ public class VideoView extends SurfaceView implements MediaPlayerControl { mMediaController.hide(); } return true; + } else if (keyCode == KeyEvent.KEYCODE_STOP + && mMediaPlayer.isPlaying()) { + pause(); + mMediaController.show(); } else { toggleMediaControlsVisiblity(); } |