diff options
| author | Teng-Hui Zhu <ztenghui@google.com> | 2011-05-04 16:19:49 -0700 |
|---|---|---|
| committer | Teng-Hui Zhu <ztenghui@google.com> | 2011-05-09 14:56:19 -0700 |
| commit | b109c8877139077fe25fa26ea2e0961b7cbb8341 (patch) | |
| tree | 129138c7925d21e4e79a11acec92e03c97255d07 /core/java/android/webkit/HTML5VideoFullScreen.java | |
| parent | 8755cc0919ce9de19b73992a1a30d0a8ed15d7b7 (diff) | |
Exit full screen support on java side
bug:4312214
Change-Id: Id3c755db0a824d42f1f8d1a0952f63d2078d163a
Diffstat (limited to 'core/java/android/webkit/HTML5VideoFullScreen.java')
| -rw-r--r-- | core/java/android/webkit/HTML5VideoFullScreen.java | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/core/java/android/webkit/HTML5VideoFullScreen.java b/core/java/android/webkit/HTML5VideoFullScreen.java index 091868368c84..1004b5f09170 100644 --- a/core/java/android/webkit/HTML5VideoFullScreen.java +++ b/core/java/android/webkit/HTML5VideoFullScreen.java @@ -208,7 +208,7 @@ public class HTML5VideoFullScreen extends HTML5VideoView // view. This happens in the WebChromeClient before this method // is invoked. pauseAndDispatch(mProxy); - + mProxy.dispatchOnStopFullScreen(); mLayout.removeView(getSurfaceView()); if (mProgressView != null) { @@ -253,7 +253,8 @@ public class HTML5VideoFullScreen extends HTML5VideoView client.onShowCustomView(mLayout, mCallback); // Plugins like Flash will draw over the video so hide // them while we're playing. - mProxy.getWebView().getViewManager().hideAll(); + if (webView.getViewManager() != null) + webView.getViewManager().hideAll(); mProgressView = client.getVideoLoadingProgressView(); if (mProgressView != null) { |