Merge "Keep the controller when video ended." into jb-dev

core/java/android/webkit/HTML5VideoFullScreen.java

@@ -198,6 +198,7 @@ public class HTML5VideoFullScreen extends HTML5VideoView
         // after reading the MetaData
         if (mMediaController != null) {
             mMediaController.setEnabled(true);
+            mMediaController.show();
         }
 
         if (mProgressView != null) {
@@ -320,6 +321,11 @@ public class HTML5VideoFullScreen extends HTML5VideoView
     return 0;
     }
 
+    @Override
+    public void showControllerInFullScreen() {
+        mMediaController.show(0);
+    }
+
     // Other listeners functions:
     private MediaPlayer.OnBufferingUpdateListener mBufferingUpdateListener =
         new MediaPlayer.OnBufferingUpdateListener() {

core/java/android/webkit/HTML5VideoView.java

@@ -357,4 +357,7 @@ public class HTML5VideoView implements MediaPlayer.OnPreparedListener {
         return mStartWhenPrepared;
     }
 
+    public void showControllerInFullScreen() {
+    }
+
 }

core/java/android/webkit/HTML5VideoViewProxy.java

@@ -279,6 +279,7 @@ class HTML5VideoViewProxy extends Handler
         }
 
         public static void end() {
+            mHTML5VideoView.showControllerInFullScreen();
             if (mCurrentProxy != null) {
                 if (isVideoSelfEnded)
                     mCurrentProxy.dispatchOnEnded();