diff options
author | Teng-Hui Zhu <ztenghui@google.com> | 2011-04-07 08:52:45 -0700 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-04-07 08:52:45 -0700 |
commit | b25181aaccb00fee405251bf3575ce1d40badf46 (patch) | |
tree | f5982ef7b6301e6053f61f4023a8840f4a86def5 | |
parent | b17cc8a83fd819efcb79d78d005e16b3f04d08df (diff) | |
parent | 0504967cb05f7bbd0c17962360a5d88ace8d173f (diff) | |
download | frameworks_base-b25181aaccb00fee405251bf3575ce1d40badf46.zip frameworks_base-b25181aaccb00fee405251bf3575ce1d40badf46.tar.gz frameworks_base-b25181aaccb00fee405251bf3575ce1d40badf46.tar.bz2 |
Merge "Fix the issue the video can't start to play" into honeycomb-mr1
-rw-r--r-- | core/java/android/webkit/HTML5VideoFullScreen.java | 7 | ||||
-rw-r--r-- | core/java/android/webkit/HTML5VideoViewProxy.java | 5 |
2 files changed, 3 insertions, 9 deletions
diff --git a/core/java/android/webkit/HTML5VideoFullScreen.java b/core/java/android/webkit/HTML5VideoFullScreen.java index 9636513..0726266 100644 --- a/core/java/android/webkit/HTML5VideoFullScreen.java +++ b/core/java/android/webkit/HTML5VideoFullScreen.java @@ -114,13 +114,6 @@ public class HTML5VideoFullScreen extends HTML5VideoView return mVideoSurfaceView; } - @Override - public void start() { - if (getAutostart()) { - super.start(); - } - } - HTML5VideoFullScreen(Context context, int videoLayerId, int position, boolean autoStart) { mVideoSurfaceView = new VideoSurfaceView(context); diff --git a/core/java/android/webkit/HTML5VideoViewProxy.java b/core/java/android/webkit/HTML5VideoViewProxy.java index acd7eab..c727029 100644 --- a/core/java/android/webkit/HTML5VideoViewProxy.java +++ b/core/java/android/webkit/HTML5VideoViewProxy.java @@ -224,8 +224,9 @@ class HTML5VideoViewProxy extends Handler } public static void onPrepared() { - // The VideoView will decide whether to really kick off to play. - mHTML5VideoView.start(); + if (!mHTML5VideoView.isFullScreenMode() || mHTML5VideoView.getAutostart()) { + mHTML5VideoView.start(); + } if (mBaseLayer != 0) { setBaseLayer(mBaseLayer); } |