Window to Tab string change
Bug: 5145162
Part of this also involved unifying the wording between tablet and
phones menu, which revealed some unused assets. Combined bookmark
phone and tablet menus into one xml, with bool switches to turn
items on/off as needed instead of having 2 very similar files
Change-Id: I700d5c5b3b7f9aefe9c96a0c79c140e3bf09ce6f
diff --git a/res/menu/browser.xml b/res/menu/browser.xml
index 1de97f7..d5bdf04 100644
--- a/res/menu/browser.xml
+++ b/res/menu/browser.xml
@@ -18,7 +18,8 @@
<group
android:id="@+id/MAIN_MENU">
<group
- android:id="@+id/NAV_MENU">
+ android:id="@+id/NAV_MENU"
+ android:visible="@bool/menu_show_navigation">
<item
android:id="@+id/stop_reload_menu_id"
android:alphabeticShortcut="r" />
@@ -29,21 +30,26 @@
</group>
<item
android:id="@+id/new_tab_menu_id"
- android:title="@string/menu_new_tab"
- android:icon="@drawable/ic_new_window_holo_dark" />
+ android:title="@string/new_tab"
+ android:icon="@drawable/ic_new_window_holo_dark"
+ android:showAsAction="never"
+ android:alphabeticShortcut="n" />
<item
android:id="@+id/incognito_menu_id"
- android:title="@string/incognito_tab"
+ 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_history_holo_dark" />
+ android:icon="@drawable/ic_bookmarks_history_holo_dark"
+ android:alphabeticShortcut="b"
+ android:visible="@bool/menu_show_bookmarks" />
<item
android:id="@+id/add_bookmark_menu_id"
android:title="@string/save_to_bookmarks"
android:icon="@drawable/ic_bookmark_on_holo_dark"
- android:alphabeticShortcut="d" />
+ android:alphabeticShortcut="d"
+ android:visible="@bool/menu_show_bookmarks" />
<item
android:id="@+id/find_menu_id"
android:title="@*android:string/find_on_page"