diff options
| author | Teng-Hui Zhu <ztenghui@google.com> | 2012-03-19 15:04:35 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-03-19 15:04:35 -0700 |
| commit | d49ea7f11e18c2dce564fa974182c9d484be91dd (patch) | |
| tree | 31611091df15e1428dcee3a07a37a33799df29a7 | |
| parent | 5f3b32c908f067c44ccb73ce467e32a17197528e (diff) | |
| parent | 2b64c5a6f70bfae7db95f763441b52a506d6f630 (diff) | |
| download | frameworks_base-d49ea7f11e18c2dce564fa974182c9d484be91dd.zip frameworks_base-d49ea7f11e18c2dce564fa974182c9d484be91dd.tar.gz frameworks_base-d49ea7f11e18c2dce564fa974182c9d484be91dd.tar.bz2 | |
Merge "Don't allow enter full screen while still in full screen mode."
| -rw-r--r-- | core/java/android/webkit/HTML5VideoViewProxy.java | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/core/java/android/webkit/HTML5VideoViewProxy.java b/core/java/android/webkit/HTML5VideoViewProxy.java index 1644b06..40c3778 100644 --- a/core/java/android/webkit/HTML5VideoViewProxy.java +++ b/core/java/android/webkit/HTML5VideoViewProxy.java @@ -146,6 +146,12 @@ class HTML5VideoViewProxy extends Handler // Save the inline video info and inherit it in the full screen int savePosition = 0; if (mHTML5VideoView != null) { + // We don't allow enter full screen mode while the previous + // full screen video hasn't finished yet. + if (!mHTML5VideoView.fullScreenExited() && mHTML5VideoView.isFullScreenMode()) { + Log.w(LOGTAG, "Try to reenter the full screen mode"); + return; + } // If we are playing the same video, then it is better to // save the current position. if (layerId == mHTML5VideoView.getVideoLayerId()) { |