summaryrefslogtreecommitdiff
path: root/core/java/android/webkit/HTML5VideoFullScreen.java
diff options
context:
space:
mode:
authorTeng-Hui Zhu <ztenghui@google.com>2012-05-11 10:00:06 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2012-05-11 10:00:06 -0700
commit9ac320406bcd0212923bfc0b4068df0b022fd4f7 (patch)
tree7a4eeba38c1dcef4b321e34240e83acda0e6ed30 /core/java/android/webkit/HTML5VideoFullScreen.java
parent6df5ca08f192e2b831c6cf216f3a2cfe63456ad0 (diff)
parent4dd9dc8204105a25e37dacbc392ea3c7212a8063 (diff)
Merge "Keep the controller when video ended." into jb-dev
Diffstat (limited to 'core/java/android/webkit/HTML5VideoFullScreen.java')
-rw-r--r--core/java/android/webkit/HTML5VideoFullScreen.java6
1 files changed, 6 insertions, 0 deletions
diff --git a/core/java/android/webkit/HTML5VideoFullScreen.java b/core/java/android/webkit/HTML5VideoFullScreen.java
index 0ec91632b92d..ea8f316a814f 100644
--- a/core/java/android/webkit/HTML5VideoFullScreen.java
+++ b/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() {