diff options
| author | Ben Murdoch <benm@google.com> | 2010-11-30 02:43:29 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-11-30 02:43:29 -0800 |
| commit | 27e728f22d954caa7252be6c19a67a9277e1db3b (patch) | |
| tree | 4e78df9c07b8d3dcce7acbf6070fcc02fd499898 | |
| parent | 349f3509f7335bbdef443a75afa36fb3c2d9552c (diff) | |
| parent | 1708ad53c3669b72d20724e52301eecd35e86377 (diff) | |
| download | frameworks_base-27e728f22d954caa7252be6c19a67a9277e1db3b.zip frameworks_base-27e728f22d954caa7252be6c19a67a9277e1db3b.tar.gz frameworks_base-27e728f22d954caa7252be6c19a67a9277e1db3b.tar.bz2 | |
Merge "Hide plugin views when we start playing HTML5 video" into gingerbread
| -rw-r--r-- | core/java/android/webkit/HTML5VideoViewProxy.java | 11 | ||||
| -rw-r--r-- | core/java/android/webkit/WebView.java | 4 |
2 files changed, 15 insertions, 0 deletions
diff --git a/core/java/android/webkit/HTML5VideoViewProxy.java b/core/java/android/webkit/HTML5VideoViewProxy.java index 6769563..85bff4f 100644 --- a/core/java/android/webkit/HTML5VideoViewProxy.java +++ b/core/java/android/webkit/HTML5VideoViewProxy.java @@ -138,6 +138,10 @@ class HTML5VideoViewProxy extends Handler mCurrentProxy.dispatchOnEnded(); else mCurrentProxy.dispatchOnPaused(); + + // Re enable plugin views. + mCurrentProxy.getWebView().getViewManager().showAll(); + isVideoSelfEnded = false; mCurrentProxy = null; mLayout.removeView(mVideoView); @@ -199,6 +203,9 @@ class HTML5VideoViewProxy extends Handler mTimer = new Timer(); mVideoView.start(); client.onShowCustomView(mLayout, mCallback); + // Plugins like Flash will draw over the video so hide + // them while we're playing. + mCurrentProxy.getWebView().getViewManager().hideAll(); } public static boolean isPlaying(HTML5VideoViewProxy proxy) { @@ -599,6 +606,10 @@ class HTML5VideoViewProxy extends Handler return new HTML5VideoViewProxy(webViewCore.getWebView(), nativePtr); } + /* package */ WebView getWebView() { + return mWebView; + } + private native void nativeOnPrepared(int duration, int width, int height, int nativePointer); private native void nativeOnEnded(int nativePointer); private native void nativeOnPaused(int nativePointer); diff --git a/core/java/android/webkit/WebView.java b/core/java/android/webkit/WebView.java index bcd0332..1915425 100644 --- a/core/java/android/webkit/WebView.java +++ b/core/java/android/webkit/WebView.java @@ -7845,6 +7845,10 @@ public class WebView extends AbsoluteLayout nativeUpdateCachedTextfield(updatedText, mTextGeneration); } + /* package */ ViewManager getViewManager() { + return mViewManager; + } + private native int nativeCacheHitFramePointer(); private native Rect nativeCacheHitNodeBounds(); private native int nativeCacheHitNodePointer(); |