commit 03aa5e01e0f224d0fe0b829a47ce27feed6cb99b
author The Android Automerger <android-build@android.com> Mon Dec 05 20:36:13 2011 -0800
committer The Android Automerger <android-build@android.com> Mon Dec 05 20:36:13 2011 -0800
tree 26069730df2982d50ed0b3e6bdc5f62165bf887b
parent 0d0245ffd51825f90a9df883667a71e500da03fa
parent 91e452ac9eb163827737d2b0fe4fbbf216d6ea2d

merge in ics-mr1-release history after reset to ics-mr1

res/menu/browser.xml

diff --git a/res/menu/browser.xml b/res/menu/browser.xml
index bf95574..bd40c51 100644
--- a/res/menu/browser.xml
+++ b/res/menu/browser.xml
@@ -39,6 +39,11 @@
             android:title="@string/new_incognito_tab"
             android:icon="@drawable/ic_new_incognito_holo_dark" />
         <item
+            android:id="@+id/bookmarks_menu_id"
+            android:title="@string/bookmarks"
+            android:icon="@drawable/ic_bookmarks_holo_dark"
+            android:showAsAction="never" />
+        <item
             android:id="@+id/add_bookmark_menu_id"
             android:title="@string/save_to_bookmarks"
             android:icon="@drawable/ic_bookmark_on_holo_dark"

src/com/android/browser/BaseUi.java

diff --git a/src/com/android/browser/BaseUi.java b/src/com/android/browser/BaseUi.java
index 88829cc..ca91367 100644
--- a/src/com/android/browser/BaseUi.java
+++ b/src/com/android/browser/BaseUi.java
@@ -749,19 +749,10 @@
     public void setFullscreen(boolean enabled) {
         Window win = mActivity.getWindow();
         WindowManager.LayoutParams winParams = win.getAttributes();
-        final int bits = WindowManager.LayoutParams.FLAG_FULLSCREEN;
+        final int bits = WindowManager.LayoutParams.FLAG_FULLSCREEN
+                | WindowManager.LayoutParams.FLAG_LAYOUT_IN_SCREEN;
         if (enabled) {
             winParams.flags |=  bits;
-            if (mCustomView != null) {
-                // HTML5 Video can ask for the HIDE_NAVIGATION specifically,
-                // and we want to differentiate it from the flash.
-                if ((mCustomView.getSystemUiVisibility()
-                        & View.SYSTEM_UI_FLAG_HIDE_NAVIGATION) == 0) {
-                    mCustomView.setSystemUiVisibility(View.SYSTEM_UI_FLAG_LOW_PROFILE);
-                }
-            } else {
-                mContentView.setSystemUiVisibility(View.SYSTEM_UI_FLAG_LOW_PROFILE);
-            }
         } else {
             winParams.flags &= ~bits;
             if (mCustomView != null) {

src/com/android/browser/PhoneUi.java

diff --git a/src/com/android/browser/PhoneUi.java b/src/com/android/browser/PhoneUi.java
index 37d0b34..4da0668 100644
--- a/src/com/android/browser/PhoneUi.java
+++ b/src/com/android/browser/PhoneUi.java
@@ -194,6 +194,10 @@
 
     @Override
     public void updateMenuState(Tab tab, Menu menu) {
+        MenuItem bm = menu.findItem(R.id.bookmarks_menu_id);
+        if (bm != null) {
+            bm.setVisible(!showingNavScreen());
+        }
         MenuItem abm = menu.findItem(R.id.add_bookmark_menu_id);
         if (abm != null) {
             abm.setVisible((tab != null) && !tab.isSnapshot() && !showingNavScreen());

src/com/android/browser/XLargeUi.java

diff --git a/src/com/android/browser/XLargeUi.java b/src/com/android/browser/XLargeUi.java
index 556e88d..c828df4 100644
--- a/src/com/android/browser/XLargeUi.java
+++ b/src/com/android/browser/XLargeUi.java
@@ -30,6 +30,8 @@
 import android.view.ActionMode;
 import android.view.Gravity;
 import android.view.KeyEvent;
+import android.view.Menu;
+import android.view.MenuItem;
 import android.view.View;
 import android.view.ViewGroup;
 import android.webkit.WebChromeClient.CustomViewCallback;
@@ -145,6 +147,16 @@
         }
     }
 
+    @Override
+    public boolean onPrepareOptionsMenu(Menu menu) {
+        MenuItem bm = menu.findItem(R.id.bookmarks_menu_id);
+        if (bm != null) {
+            bm.setVisible(false);
+        }
+        return true;
+    }
+
+
     // WebView callbacks
 
     @Override