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

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"

res/values-sw600dp/bools.xml

@@ -13,4 +13,7 @@
 <resources
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <bool name="isTablet">true</bool>
+    <!-- Browser menu toggles -->
+    <bool name="menu_show_navigation">false</bool>
+    <bool name="menu_show_bookmarks">false</bool>
 </resources>

res/values/bools.xml

@@ -14,4 +14,7 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <bool name="isTablet">false</bool>
     <bool name="hide_nav_buttons">true</bool>
+    <!-- Browser menu toggles -->
+    <bool name="menu_show_navigation">true</bool>
+    <bool name="menu_show_bookmarks">true</bool>
 </resources>

res/values/strings.xml

@@ -22,10 +22,10 @@
          system can provide a file [CHAR-LIMIT=NONE]-->
     <string name="uploads_disabled">File uploads are disabled.</string>
     <!-- Name of menu item of a new tab.  Also used in the title bar when displaying a new tab -->
-    <string name="new_tab">New window</string>
+    <string name="new_tab">New tab</string>
     <!-- Name of menu item of a new incognito tab.  Also used in the
          title bar when displaying a new tab [CHAR LIMIT=30] -->
-    <string name="new_incognito_tab">New incognito window</string>
+    <string name="new_incognito_tab">New incognito tab</string>
     <!-- Name of tab containing bookmarks -->
     <string name="tab_bookmarks">Bookmarks</string>
     <!-- Name of tab containing the user's most visited websites, organized by number of visits -->
@@ -193,20 +193,12 @@
     <!-- Confirmation dialog message confirming that the user wishes to delete
             the bookmark they selected for deletion -->
     <string name="delete_bookmark_warning">Bookmark \"<xliff:g id="bookmark">%s</xliff:g>\" will be deleted.</string>
-    <!-- Context menu item to open every bookmark in a folder in new windows [CHAR LIMIT=50] -->
-    <string name="open_all_in_new_window">Open all in new windows</string>
+    <!-- Context menu item to open every bookmark in a folder in new tabs [CHAR LIMIT=50] -->
+    <string name="open_all_in_new_window">Open all in new tabs</string>
     <!-- Menu item to open a dialog which allows the user to enter a url or do search-->
     <string name="goto_dot">Go</string>
-    <!-- Menu item that opens up a new tab. [CHAR LIMIT=30] -->
-    <string name="menu_new_tab">Open new tab</string>
-    <!-- Menu item that opens up a new incognito tab. [CHAR LIMIT=30] -->
-    <string name="incognito_tab">Open new incognito tab</string>
     <!-- Menu item to switch to text selection mode for copy and paste. -->
     <string name="select_dot">Select text</string>
-    <!-- Title of current windows screen; appears in title bar -->
-    <string name="tab_picker_title">Current windows</string>
-    <!-- Context Menu item to close the currently selected window -->
-    <string name="tab_picker_remove_tab">Close</string>
     <!-- Menu item to open the bookmarks page. This is a shorter version that
             is displayed with an icon -->
     <string name="bookmarks">Bookmarks</string>
@@ -234,10 +226,10 @@
     <string name="contextmenu_openlink">Open</string>
     <!-- Context Menu item to open the currently selected link in a new
             window. -->
-    <string name="contextmenu_openlink_newwindow">Open in new window</string>
+    <string name="contextmenu_openlink_newwindow">Open in new tab</string>
     <!-- Context Menu item to open the currently selected link in a new
          background window. [CHAR LIMIT=50] -->
-    <string name="contextmenu_openlink_newwindow_background">Open in new background window</string>
+    <string name="contextmenu_openlink_newwindow_background">Open in new background tab</string>
     <!-- Context Menu item to save the webpage referred to by this link to the
             SD card (external storage) -->
     <string name="contextmenu_savelink">Save link</string>
@@ -314,7 +306,7 @@
         <item>OFF</item>
     </string-array>
     <!-- Settings summary [CHAR LIMIT=50]-->
-    <string name="pref_content_open_in_background_summary">Open new windows behind the current one</string>
+    <string name="pref_content_open_in_background_summary">Open new tabs behind the current one</string>
     <!-- Settings label [CHAR LIMIT=50] -->
     <string name="pref_content_homepage">Set homepage</string>
     <!-- Settings label -->
@@ -724,10 +716,10 @@
 
     <!-- Title for a dialog informing the user that they cannot open any more
             windows because the limit has been reached. -->
-    <string name="too_many_windows_dialog_title">Window limit reached</string>
+    <string name="too_many_windows_dialog_title">Tab limit reached</string>
     <!-- Message in a dialog telling the user that they cannot open any more
             windows because the limit has been reached. -->
-    <string name="too_many_windows_dialog_message">Could not open a new window because you have already opened the maximum number.</string>
+    <string name="too_many_windows_dialog_message">Could not open a new tab because you have already opened the maximum number.</string>
     <!-- Title for a dialog informing the user that they cannot open a subwindow
             because only one can be open at a time. -->
     <string name="too_many_subwindows_dialog_title">Pop-up already open</string>