summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTeng-Hui Zhu <ztenghui@google.com>2011-03-23 16:03:04 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2011-03-23 16:03:04 -0700
commitefb8eda41a2dce03db0984c490c16f6a32867ded (patch)
tree13790992ba7bda6fe3825a15b491758abbb579b2
parentac390b8cacc45c866ae2e60c0e492a914cf6ec78 (diff)
parent2deec6651c5fc2f479a7d594cad00e36edf73eaf (diff)
downloadframeworks_base-efb8eda41a2dce03db0984c490c16f6a32867ded.zip
frameworks_base-efb8eda41a2dce03db0984c490c16f6a32867ded.tar.gz
frameworks_base-efb8eda41a2dce03db0984c490c16f6a32867ded.tar.bz2
Merge "Make sure the full screen playing continue when timeout" into honeycomb-mr1
-rw-r--r--core/java/android/webkit/HTML5VideoFullScreen.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/core/java/android/webkit/HTML5VideoFullScreen.java b/core/java/android/webkit/HTML5VideoFullScreen.java
index 0510f8b..9636513 100644
--- a/core/java/android/webkit/HTML5VideoFullScreen.java
+++ b/core/java/android/webkit/HTML5VideoFullScreen.java
@@ -153,7 +153,7 @@ public class HTML5VideoFullScreen extends HTML5VideoView
// So in full screen, we reset the MediaPlayer
mPlayer.reset();
setMediaController(new MediaController(mProxy.getContext()));
-
+ mPlayer.setScreenOnWhilePlaying(true);
prepareDataAndDisplayMode(mProxy);
}