From 22f7dfd23490a3de2f21ff96949ba47003aac8f8 Mon Sep 17 00:00:00 2001
From: The Android Open Source Project <initial-contribution@android.com>
Date: Tue, 20 Jan 2009 14:03:58 -0800
Subject: auto import from //branches/cupcake/...@127101

---
 core/java/android/widget/VideoView.java | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'core/java/android/widget/VideoView.java')

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();
             }
-- 
cgit v1.2.3