Merge change 22008 into eclair

* changes:
  When bringing up the media controller view, focus the play/pause button.

1 files changed, 6 insertions, 0 deletions

diff --git a/core/java/android/widget/MediaController.java b/core/java/android/widget/MediaController.java
index 9910c37..446a992 100644
--- a/core/java/android/widget/MediaController.java
+++ b/core/java/android/widget/MediaController.java
@@ -282,6 +282,9 @@ public class MediaController extends FrameLayout {
 
         if (!mShowing && mAnchor != null) {
             setProgress();
+            if (mPauseButton != null) {
+                mPauseButton.requestFocus();
+            }
             disableUnsupportedButtons();
 
             int [] anchorpos = new int[2];
@@ -416,6 +419,9 @@ public class MediaController extends FrameLayout {
                 keyCode ==  KeyEvent.KEYCODE_SPACE)) {
             doPauseResume();
             show(sDefaultTimeout);
+            if (mPauseButton != null) {
+                mPauseButton.requestFocus();
+            }
             return true;
         } else if (keyCode ==  KeyEvent.KEYCODE_MEDIA_STOP) {
             if (mPlayer.isPlaying()) {