fix action bar and menu
Bug: 5077207
Bug: 5097486
cleaned up action bar items
dynamically change menu items based on context
bookmarks option added to nav bar menu
new tab added to navbar menu
find/addbookmark only on real pages
removed new incognito tab from tab switcher action bar
Change-Id: I973f20a13bb7d9900041f717aff012e7a2c735b8
diff --git a/res/layout-land/nav_screen.xml b/res/layout-land/nav_screen.xml
index 8e10f02..5a3a037 100644
--- a/res/layout-land/nav_screen.xml
+++ b/res/layout-land/nav_screen.xml
@@ -32,28 +32,14 @@
android:id="@+id/newtab"
android:layout_width="wrap_content"
android:layout_height="match_parent"
- android:paddingLeft="16dip"
- android:paddingRight="16dip"
style="@style/HoloButton"
android:gravity="center_vertical"
android:contentDescription="@string/accessibility_button_newtab"
android:src="@drawable/ic_new_window_holo_dark" />
<ImageButton
- android:id="@+id/newincognito"
- android:layout_width="wrap_content"
- android:layout_height="match_parent"
- android:paddingLeft="16dip"
- android:paddingRight="16dip"
- style="@style/HoloButton"
- android:gravity="center_vertical"
- android:contentDescription="@string/accessibility_button_newincognitotab"
- android:src="@drawable/ic_new_incognito_holo_dark" />
- <ImageButton
android:id="@+id/bookmarks"
android:layout_width="wrap_content"
android:layout_height="match_parent"
- android:paddingLeft="16dip"
- android:paddingRight="16dip"
android:contentDescription="@string/accessibility_button_bookmarks"
android:src="@drawable/ic_bookmarks_history_holo_dark"
style="@style/HoloButton" />
@@ -61,8 +47,8 @@
android:id="@+id/more"
android:layout_width="wrap_content"
android:layout_height="match_parent"
- android:paddingLeft="16dip"
- android:paddingRight="16dip"
+ android:paddingLeft="8dip"
+ android:paddingRight="8dip"
style="@style/HoloButton"
android:gravity="center_vertical"
android:contentDescription="@string/accessibility_button_more"
diff --git a/res/layout/nav_screen.xml b/res/layout/nav_screen.xml
index 8ff4be3..4e00fa3 100644
--- a/res/layout/nav_screen.xml
+++ b/res/layout/nav_screen.xml
@@ -37,28 +37,14 @@
android:id="@+id/newtab"
android:layout_width="wrap_content"
android:layout_height="match_parent"
- android:paddingLeft="16dip"
- android:paddingRight="16dip"
style="@style/HoloButton"
android:gravity="center_vertical"
android:contentDescription="@string/accessibility_button_newtab"
android:src="@drawable/ic_new_window_holo_dark" />
<ImageButton
- android:id="@+id/newincognito"
- android:layout_width="wrap_content"
- android:layout_height="match_parent"
- android:paddingLeft="16dip"
- android:paddingRight="16dip"
- style="@style/HoloButton"
- android:gravity="center_vertical"
- android:contentDescription="@string/accessibility_button_newincognitotab"
- android:src="@drawable/ic_new_incognito_holo_dark" />
- <ImageButton
android:id="@+id/bookmarks"
android:layout_width="wrap_content"
android:layout_height="match_parent"
- android:paddingLeft="16dip"
- android:paddingRight="16dip"
android:contentDescription="@string/accessibility_button_bookmarks"
android:src="@drawable/ic_bookmarks_history_holo_dark"
style="@style/HoloButton" />
@@ -66,8 +52,8 @@
android:id="@+id/more"
android:layout_width="wrap_content"
android:layout_height="match_parent"
- android:paddingLeft="16dip"
- android:paddingRight="16dip"
+ android:paddingLeft="8dip"
+ android:paddingRight="8dip"
style="@style/HoloButton"
android:gravity="center_vertical"
android:contentDescription="@string/accessibility_button_more"
diff --git a/res/menu/browser.xml b/res/menu/browser.xml
index 0b46db6..1de97f7 100644
--- a/res/menu/browser.xml
+++ b/res/menu/browser.xml
@@ -28,10 +28,18 @@
android:icon="@*android:drawable/ic_menu_forward" />
</group>
<item
+ android:id="@+id/new_tab_menu_id"
+ android:title="@string/menu_new_tab"
+ android:icon="@drawable/ic_new_window_holo_dark" />
+ <item
android:id="@+id/incognito_menu_id"
android:title="@string/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" />
+ <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/res/values/strings.xml b/res/values/strings.xml
index 4ed6c21..d9667bc 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -197,6 +197,8 @@
<string name="open_all_in_new_window">Open all in new windows</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. -->