From b109c8877139077fe25fa26ea2e0961b7cbb8341 Mon Sep 17 00:00:00 2001 From: Teng-Hui Zhu Date: Wed, 4 May 2011 16:19:49 -0700 Subject: Exit full screen support on java side bug:4312214 Change-Id: Id3c755db0a824d42f1f8d1a0952f63d2078d163a --- core/java/android/webkit/HTML5VideoFullScreen.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'core/java/android/webkit/HTML5VideoFullScreen.java') 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) { -- cgit v1.2.3