commit cb02ddd71024cf1c74c8673417feb9501a63c99b
author Michael Kolb <kolby@google.com> Fri Oct 21 16:49:39 2011 -0700
committer Android Git Automerger <android-git-automerger@android.com> Fri Oct 21 16:49:39 2011 -0700
tree 0609d890962f92dc6e6d850e569b9d35ef2e7cf6
parent 3a5b0c071fced167fd1547756724ef84361c92a4
parent 1eb7d1224fafa2c7f327c808cf6eec6269297493

am 1eb7d122: Merge "Fix fullscreen mode" into ics-mr0

* commit '1eb7d1224fafa2c7f327c808cf6eec6269297493':
  Fix fullscreen mode

src/com/android/browser/BaseUi.java

diff --git a/src/com/android/browser/BaseUi.java b/src/com/android/browser/BaseUi.java
index 26f90b6..ee308f9 100644
--- a/src/com/android/browser/BaseUi.java
+++ b/src/com/android/browser/BaseUi.java
@@ -42,6 +42,7 @@
 import android.view.View.OnClickListener;
 import android.view.ViewGroup;
 import android.view.ViewGroup.LayoutParams;
+import android.view.Window;
 import android.view.WindowManager;
 import android.view.inputmethod.InputMethodManager;
 import android.webkit.WebChromeClient;
@@ -523,6 +524,7 @@
         mFullscreenContainer.addView(view, COVER_SCREEN_PARAMS);
         decor.addView(mFullscreenContainer, COVER_SCREEN_PARAMS);
         mCustomView = view;
+        setFullscreen(true);
         mCustomViewCallback = callback;
         mActivity.setRequestedOrientation(requestedOrientation);
     }
@@ -531,6 +533,7 @@
     public void onHideCustomView() {
         if (mCustomView == null)
             return;
+        setFullscreen(false);
         FrameLayout decor = (FrameLayout) mActivity.getWindow().getDecorView();
         decor.removeView(mFullscreenContainer);
         mFullscreenContainer = null;
@@ -749,14 +752,25 @@
     }
 
     public void setFullscreen(boolean enabled) {
+        Window win = mActivity.getWindow();
+        WindowManager.LayoutParams winParams = win.getAttributes();
+        final int bits = WindowManager.LayoutParams.FLAG_FULLSCREEN;
         if (enabled) {
-            mActivity.getWindow().setFlags(
-                    WindowManager.LayoutParams.FLAG_FULLSCREEN,
-                    WindowManager.LayoutParams.FLAG_FULLSCREEN);
+            winParams.flags |=  bits;
+            if (mCustomView != null) {
+                mCustomView.setSystemUiVisibility(View.SYSTEM_UI_FLAG_LOW_PROFILE);
+            } else {
+                mContentView.setSystemUiVisibility(View.SYSTEM_UI_FLAG_LOW_PROFILE);
+            }
         } else {
-            mActivity.getWindow().clearFlags(
-                    WindowManager.LayoutParams.FLAG_FULLSCREEN);
+            winParams.flags &= ~bits;
+            if (mCustomView != null) {
+                mCustomView.setSystemUiVisibility(View.SYSTEM_UI_FLAG_VISIBLE);
+            } else {
+                mContentView.setSystemUiVisibility(View.SYSTEM_UI_FLAG_VISIBLE);
+            }
         }
+        win.setAttributes(winParams);
     }
 
     public Drawable getFaviconDrawable(Bitmap icon) {