commit b145112effca63e770f52c5573980a204035b23a
author Teng-Hui Zhu <ztenghui@google.com> Wed Jun 01 15:53:18 2011 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Wed Jun 01 15:53:18 2011 -0700
tree 409280d425122e78ab398b8a2efa7bee696beb0a
parent aef1987f4e53efdc29216ac66d7412678a762b2e
parent 1a88acbed9cd04d7c8ddd0c33a15926238157a07

Merge "Correctly detect when switching back from full screen"

core/java/android/webkit/HTML5VideoFullScreen.java

diff --git a/core/java/android/webkit/HTML5VideoFullScreen.java b/core/java/android/webkit/HTML5VideoFullScreen.java
index 1004b5f..57cda97 100644
--- a/core/java/android/webkit/HTML5VideoFullScreen.java
+++ b/core/java/android/webkit/HTML5VideoFullScreen.java
@@ -199,6 +199,9 @@
         mVideoSurfaceView.getHolder().setFixedSize(mVideoWidth, mVideoHeight);
     }
 
+    public boolean fullScreenExited() {
+        return (mLayout == null);
+    }
 
     private final WebChromeClient.CustomViewCallback mCallback =
         new WebChromeClient.CustomViewCallback() {

core/java/android/webkit/HTML5VideoView.java

diff --git a/core/java/android/webkit/HTML5VideoView.java b/core/java/android/webkit/HTML5VideoView.java
index 8b92bb0..5983a44 100644
--- a/core/java/android/webkit/HTML5VideoView.java
+++ b/core/java/android/webkit/HTML5VideoView.java
@@ -320,4 +320,9 @@
         return false;
     }
 
+    public boolean fullScreenExited() {
+        // Only meaningful for HTML5VideoFullScreen
+        return false;
+    }
+
 }

core/java/android/webkit/HTML5VideoViewProxy.java

diff --git a/core/java/android/webkit/HTML5VideoViewProxy.java b/core/java/android/webkit/HTML5VideoViewProxy.java
index aa254d9d..d0237b5 100644
--- a/core/java/android/webkit/HTML5VideoViewProxy.java
+++ b/core/java/android/webkit/HTML5VideoViewProxy.java
@@ -173,9 +173,7 @@
             boolean backFromFullScreenMode = false;
             if (mHTML5VideoView != null) {
                 currentVideoLayerId = mHTML5VideoView.getVideoLayerId();
-                if (mHTML5VideoView instanceof HTML5VideoFullScreen) {
-                    backFromFullScreenMode = true;
-                }
+                backFromFullScreenMode = mHTML5VideoView.fullScreenExited();
             }
 
             if (backFromFullScreenMode