summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Kolb <kolby@google.com>2011-12-05 16:36:05 -0800
committerMichael Kolb <kolby@google.com>2011-12-05 16:39:25 -0800
commit0d0245ffd51825f90a9df883667a71e500da03fa (patch)
tree26069730df2982d50ed0b3e6bdc5f62165bf887b
parent861d52c80430edeb0eba6f73cd0e206e27f4ac6b (diff)
downloadpackages_apps_browser-0d0245ffd51825f90a9df883667a71e500da03fa.zip
packages_apps_browser-0d0245ffd51825f90a9df883667a71e500da03fa.tar.gz
packages_apps_browser-0d0245ffd51825f90a9df883667a71e500da03fa.tar.bz2
Add Bookmarks option to phone menu
Bug: 5713465 Change-Id: I7a260ea5138efca9b4f8ac461a03207480b438df
-rw-r--r--res/menu/browser.xml5
-rw-r--r--src/com/android/browser/PhoneUi.java4
-rw-r--r--src/com/android/browser/XLargeUi.java12
3 files changed, 21 insertions, 0 deletions
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"
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 @@ 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 556e88d..c828df4 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