From 0d0245ffd51825f90a9df883667a71e500da03fa Mon Sep 17 00:00:00 2001
From: Michael Kolb <kolby@google.com>
Date: Mon, 5 Dec 2011 16:36:05 -0800
Subject: Add Bookmarks option to phone menu

    Bug: 5713465

Change-Id: I7a260ea5138efca9b4f8ac461a03207480b438df
---
 src/com/android/browser/PhoneUi.java  |  4 ++++
 src/com/android/browser/XLargeUi.java | 12 ++++++++++++
 2 files changed, 16 insertions(+)

(limited to 'src/com/android')

diff --git a/src/com/android/browser/PhoneUi.java b/src/com/android/browser/PhoneUi.java
index 37d0b3415..4da0668a0 100644
--- a/src/com/android/browser/PhoneUi.java
+++ b/src/com/android/browser/PhoneUi.java
@@ -194,6 +194,10 @@ public class PhoneUi extends BaseUi {
 
     @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());
diff --git a/src/com/android/browser/XLargeUi.java b/src/com/android/browser/XLargeUi.java
index 556e88d1d..c828df420 100644
--- a/src/com/android/browser/XLargeUi.java
+++ b/src/com/android/browser/XLargeUi.java
@@ -30,6 +30,8 @@ import android.util.Log;
 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 @@ public class XLargeUi extends BaseUi {
         }
     }
 
+    @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
-- 
cgit v1.2.3