Merge "Browser layout fixes and asset updates"
diff --git a/res/drawable-hdpi/browser_background_holo.9.png b/res/drawable-hdpi/browser_background_holo.9.png
deleted file mode 100644
index 840ed27..0000000
--- a/res/drawable-hdpi/browser_background_holo.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_bookmarks_history_holo_dark.png b/res/drawable-hdpi/ic_bookmarks_history_holo_dark.png
index df527a2..afd5c16 100644
--- a/res/drawable-hdpi/ic_bookmarks_history_holo_dark.png
+++ b/res/drawable-hdpi/ic_bookmarks_history_holo_dark.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_new_window_holo_dark.png b/res/drawable-hdpi/ic_new_window_holo_dark.png
index 0a2218b..70cc97d 100644
--- a/res/drawable-hdpi/ic_new_window_holo_dark.png
+++ b/res/drawable-hdpi/ic_new_window_holo_dark.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_search_category_suggest.png b/res/drawable-hdpi/ic_search_category_suggest.png
index 9ee751c..165a11d 100644
--- a/res/drawable-hdpi/ic_search_category_suggest.png
+++ b/res/drawable-hdpi/ic_search_category_suggest.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_tab_close.png b/res/drawable-hdpi/ic_tab_close.png
index d48e0e7..199af9a 100644
--- a/res/drawable-hdpi/ic_tab_close.png
+++ b/res/drawable-hdpi/ic_tab_close.png
Binary files differ
diff --git a/res/drawable-hdpi/nav_tab_bg.9.png b/res/drawable-hdpi/nav_tab_bg.9.png
index b110633..bccdbdc 100644
--- a/res/drawable-hdpi/nav_tab_bg.9.png
+++ b/res/drawable-hdpi/nav_tab_bg.9.png
Binary files differ
diff --git a/res/drawable-hdpi/overlay_url_bookmark_widget_holo.9.png b/res/drawable-hdpi/overlay_url_bookmark_widget_holo.9.png
index f678d8e..aeb978d 100644
--- a/res/drawable-hdpi/overlay_url_bookmark_widget_holo.9.png
+++ b/res/drawable-hdpi/overlay_url_bookmark_widget_holo.9.png
Binary files differ
diff --git a/res/drawable-hdpi/progress.9.png b/res/drawable-hdpi/progress.9.png
index 26918ac..da3ce0a 100644
--- a/res/drawable-hdpi/progress.9.png
+++ b/res/drawable-hdpi/progress.9.png
Binary files differ
diff --git a/res/drawable-hdpi/textfield_active_holo_dark.9.png b/res/drawable-hdpi/textfield_active_holo_dark.9.png
index d91c613..dd223c7 100644
--- a/res/drawable-hdpi/textfield_active_holo_dark.9.png
+++ b/res/drawable-hdpi/textfield_active_holo_dark.9.png
Binary files differ
diff --git a/res/drawable-hdpi/textfield_default_holo_dark.9.png b/res/drawable-hdpi/textfield_default_holo_dark.9.png
index 9a4e0d8..7ea6c26 100644
--- a/res/drawable-hdpi/textfield_default_holo_dark.9.png
+++ b/res/drawable-hdpi/textfield_default_holo_dark.9.png
Binary files differ
diff --git a/res/drawable-hdpi/thumb_bookmark_widget_folder_back_holo.png b/res/drawable-hdpi/thumb_bookmark_widget_folder_back_holo.png
index 4e43329..0504254 100644
--- a/res/drawable-hdpi/thumb_bookmark_widget_folder_back_holo.png
+++ b/res/drawable-hdpi/thumb_bookmark_widget_folder_back_holo.png
Binary files differ
diff --git a/res/drawable-hdpi/thumb_bookmark_widget_folder_holo.png b/res/drawable-hdpi/thumb_bookmark_widget_folder_holo.png
index e491eab..6ea442a 100644
--- a/res/drawable-hdpi/thumb_bookmark_widget_folder_holo.png
+++ b/res/drawable-hdpi/thumb_bookmark_widget_folder_holo.png
Binary files differ
diff --git a/res/drawable-mdpi/browser_background_holo.9.png b/res/drawable-mdpi/browser_background_holo.9.png
deleted file mode 100644
index f84e6a3..0000000
--- a/res/drawable-mdpi/browser_background_holo.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_bookmarks_history_holo_dark.png b/res/drawable-mdpi/ic_bookmarks_history_holo_dark.png
index 4933165..f4953e5 100644
--- a/res/drawable-mdpi/ic_bookmarks_history_holo_dark.png
+++ b/res/drawable-mdpi/ic_bookmarks_history_holo_dark.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_new_window_holo_dark.png b/res/drawable-mdpi/ic_new_window_holo_dark.png
index 2f441d9..026afd0 100644
--- a/res/drawable-mdpi/ic_new_window_holo_dark.png
+++ b/res/drawable-mdpi/ic_new_window_holo_dark.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_search_category_suggest.png b/res/drawable-mdpi/ic_search_category_suggest.png
index b9c374b..0f04fc4 100644
--- a/res/drawable-mdpi/ic_search_category_suggest.png
+++ b/res/drawable-mdpi/ic_search_category_suggest.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_tab_close.png b/res/drawable-mdpi/ic_tab_close.png
index d6e01c0..33f5c43 100644
--- a/res/drawable-mdpi/ic_tab_close.png
+++ b/res/drawable-mdpi/ic_tab_close.png
Binary files differ
diff --git a/res/drawable-mdpi/nav_tab_bg.9.png b/res/drawable-mdpi/nav_tab_bg.9.png
index e8657be..e539b66 100644
--- a/res/drawable-mdpi/nav_tab_bg.9.png
+++ b/res/drawable-mdpi/nav_tab_bg.9.png
Binary files differ
diff --git a/res/drawable-mdpi/overlay_url_bookmark_widget_holo.9.png b/res/drawable-mdpi/overlay_url_bookmark_widget_holo.9.png
index 59d8859..391b98d 100644
--- a/res/drawable-mdpi/overlay_url_bookmark_widget_holo.9.png
+++ b/res/drawable-mdpi/overlay_url_bookmark_widget_holo.9.png
Binary files differ
diff --git a/res/drawable-mdpi/progress.9.png b/res/drawable-mdpi/progress.9.png
index 9f1f543..9ccee66 100644
--- a/res/drawable-mdpi/progress.9.png
+++ b/res/drawable-mdpi/progress.9.png
Binary files differ
diff --git a/res/drawable-mdpi/textfield_active_holo_dark.9.png b/res/drawable-mdpi/textfield_active_holo_dark.9.png
index 06eed05..296760d 100644
--- a/res/drawable-mdpi/textfield_active_holo_dark.9.png
+++ b/res/drawable-mdpi/textfield_active_holo_dark.9.png
Binary files differ
diff --git a/res/drawable-mdpi/textfield_default_holo_dark.9.png b/res/drawable-mdpi/textfield_default_holo_dark.9.png
index ce63553..eb88c4d 100644
--- a/res/drawable-mdpi/textfield_default_holo_dark.9.png
+++ b/res/drawable-mdpi/textfield_default_holo_dark.9.png
Binary files differ
diff --git a/res/drawable-mdpi/thumb_bookmark_widget_folder_back_holo.png b/res/drawable-mdpi/thumb_bookmark_widget_folder_back_holo.png
index d72f631..2d9b5f8 100644
--- a/res/drawable-mdpi/thumb_bookmark_widget_folder_back_holo.png
+++ b/res/drawable-mdpi/thumb_bookmark_widget_folder_back_holo.png
Binary files differ
diff --git a/res/drawable-mdpi/thumb_bookmark_widget_folder_holo.png b/res/drawable-mdpi/thumb_bookmark_widget_folder_holo.png
index 22603fe..eba5c53 100644
--- a/res/drawable-mdpi/thumb_bookmark_widget_folder_holo.png
+++ b/res/drawable-mdpi/thumb_bookmark_widget_folder_holo.png
Binary files differ
diff --git a/res/drawable-nodpi/bg_urlbar.png b/res/drawable-nodpi/bg_urlbar.png
index 51e95e0..325aad7 100644
--- a/res/drawable-nodpi/bg_urlbar.png
+++ b/res/drawable-nodpi/bg_urlbar.png
Binary files differ
diff --git a/res/drawable-nodpi/browser_background_holo.png b/res/drawable-nodpi/browser_background_holo.png
new file mode 100644
index 0000000..62ee0ef
--- /dev/null
+++ b/res/drawable-nodpi/browser_background_holo.png
Binary files differ
diff --git a/res/drawable-xhdpi/browser_background_holo.9.png b/res/drawable-xhdpi/browser_background_holo.9.png
deleted file mode 100644
index 0853b34..0000000
--- a/res/drawable-xhdpi/browser_background_holo.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_bookmarks_history_holo_dark.png b/res/drawable-xhdpi/ic_bookmarks_history_holo_dark.png
index 702379b..71fdd09 100644
--- a/res/drawable-xhdpi/ic_bookmarks_history_holo_dark.png
+++ b/res/drawable-xhdpi/ic_bookmarks_history_holo_dark.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_new_window_holo_dark.png b/res/drawable-xhdpi/ic_new_window_holo_dark.png
index c2da72f..69420f7 100644
--- a/res/drawable-xhdpi/ic_new_window_holo_dark.png
+++ b/res/drawable-xhdpi/ic_new_window_holo_dark.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_search_category_suggest.png b/res/drawable-xhdpi/ic_search_category_suggest.png
index d663b1b..be0388c 100644
--- a/res/drawable-xhdpi/ic_search_category_suggest.png
+++ b/res/drawable-xhdpi/ic_search_category_suggest.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_search_holo_dark.png b/res/drawable-xhdpi/ic_search_holo_dark.png
index 4a06c2e..fbc62cf 100644
--- a/res/drawable-xhdpi/ic_search_holo_dark.png
+++ b/res/drawable-xhdpi/ic_search_holo_dark.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_tab_close.png b/res/drawable-xhdpi/ic_tab_close.png
index fa63021..65f09dd 100644
--- a/res/drawable-xhdpi/ic_tab_close.png
+++ b/res/drawable-xhdpi/ic_tab_close.png
Binary files differ
diff --git a/res/drawable-xhdpi/nav_tab_bg.9.png b/res/drawable-xhdpi/nav_tab_bg.9.png
index 336b17d..299f8d4 100644
--- a/res/drawable-xhdpi/nav_tab_bg.9.png
+++ b/res/drawable-xhdpi/nav_tab_bg.9.png
Binary files differ
diff --git a/res/drawable-xhdpi/overlay_url_bookmark_widget_holo.9.png b/res/drawable-xhdpi/overlay_url_bookmark_widget_holo.9.png
index d4e4e7f..8bfaa63 100644
--- a/res/drawable-xhdpi/overlay_url_bookmark_widget_holo.9.png
+++ b/res/drawable-xhdpi/overlay_url_bookmark_widget_holo.9.png
Binary files differ
diff --git a/res/drawable-xhdpi/progress.9.png b/res/drawable-xhdpi/progress.9.png
index 6d99976..f6f8d8d 100644
--- a/res/drawable-xhdpi/progress.9.png
+++ b/res/drawable-xhdpi/progress.9.png
Binary files differ
diff --git a/res/drawable-xhdpi/textfield_active_holo_dark.9.png b/res/drawable-xhdpi/textfield_active_holo_dark.9.png
index 5a4c062..97687e5 100644
--- a/res/drawable-xhdpi/textfield_active_holo_dark.9.png
+++ b/res/drawable-xhdpi/textfield_active_holo_dark.9.png
Binary files differ
diff --git a/res/drawable-xhdpi/textfield_default_holo_dark.9.png b/res/drawable-xhdpi/textfield_default_holo_dark.9.png
index 3d3bb21..c3e59fc 100644
--- a/res/drawable-xhdpi/textfield_default_holo_dark.9.png
+++ b/res/drawable-xhdpi/textfield_default_holo_dark.9.png
Binary files differ
diff --git a/res/drawable-xhdpi/thumb_bookmark_widget_folder_back_holo.png b/res/drawable-xhdpi/thumb_bookmark_widget_folder_back_holo.png
index 6216ef1..f1e6d36 100644
--- a/res/drawable-xhdpi/thumb_bookmark_widget_folder_back_holo.png
+++ b/res/drawable-xhdpi/thumb_bookmark_widget_folder_back_holo.png
Binary files differ
diff --git a/res/drawable-xhdpi/thumb_bookmark_widget_folder_holo.png b/res/drawable-xhdpi/thumb_bookmark_widget_folder_holo.png
index 7e56f0f..5c3cfd2 100644
--- a/res/drawable-xhdpi/thumb_bookmark_widget_folder_holo.png
+++ b/res/drawable-xhdpi/thumb_bookmark_widget_folder_holo.png
Binary files differ
diff --git a/res/layout-land/nav_screen.xml b/res/layout-land/nav_screen.xml
index ba7ac26..fdadd6a 100644
--- a/res/layout-land/nav_screen.xml
+++ b/res/layout-land/nav_screen.xml
@@ -19,7 +19,7 @@
android:id="@+id/nav_screen"
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:background="@drawable/browser_background_holo" >
+ android:background="@drawable/browser_background_holo">
<com.android.browser.NavTabScroller
android:id="@+id/scroller"
android:layout_width="match_parent"
@@ -31,7 +31,7 @@
android:layout_height="@dimen/toolbar_height"
android:layout_gravity="top"
android:gravity="right"
- android:background="#C0404040">
+ android:background="#CC0d0d0d">
<ImageButton
android:id="@+id/newtab"
android:layout_width="wrap_content"
diff --git a/res/layout/nav_screen.xml b/res/layout/nav_screen.xml
index ae0db1b..c655727 100644
--- a/res/layout/nav_screen.xml
+++ b/res/layout/nav_screen.xml
@@ -32,7 +32,7 @@
android:layout_height="@dimen/toolbar_height"
android:layout_gravity="top"
android:gravity="right"
- android:background="#C0404040">
+ android:background="#CC0d0d0d">
<ImageButton
android:id="@+id/newtab"
android:layout_width="wrap_content"
diff --git a/res/layout/nav_tab_view.xml b/res/layout/nav_tab_view.xml
index cdfcda7..82541a4 100644
--- a/res/layout/nav_tab_view.xml
+++ b/res/layout/nav_tab_view.xml
@@ -26,7 +26,7 @@
android:id="@+id/titlebar"
android:orientation="horizontal"
android:layout_width="match_parent"
- android:layout_height="48dip"
+ android:layout_height="32dip"
android:layout_gravity="center_horizontal"
android:paddingLeft="8dip" >
<TextView
@@ -43,7 +43,7 @@
android:drawablePadding="8dip" />
<ImageView
android:id="@+id/closetab"
- android:src="@drawable/ic_stop_holo_dark"
+ android:src="@drawable/ic_tab_close"
android:layout_gravity="center_vertical"
android:layout_width="wrap_content"
android:layout_height="match_parent"
diff --git a/res/layout/title_bar_nav.xml b/res/layout/title_bar_nav.xml
index 8ed6331..15568c3 100644
--- a/res/layout/title_bar_nav.xml
+++ b/res/layout/title_bar_nav.xml
@@ -24,12 +24,14 @@
android:layout_weight="1.0"
android:layout_height="match_parent"
android:gravity="center_vertical"
+ android:layout_marginLeft="8dip"
+ android:layout_marginRight="8dip"
android:orientation="horizontal">
<ImageView
android:id="@+id/magnify"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:paddingLeft="8dip"
+ android:paddingLeft="4dip"
android:paddingRight="8dip"
android:visibility="gone"
android:src="@drawable/ic_search_category_suggest" />
@@ -37,23 +39,25 @@
android:id="@+id/incognito_icon"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:paddingLeft="8dip"
+ android:paddingLeft="4dip"
android:visibility="gone"
android:src="@drawable/ic_incognito_holo_dark" />
<FrameLayout
android:id="@+id/iconcombo"
- android:layout_width="52dip"
+ android:layout_width="44dip"
android:layout_height="match_parent"
style="@style/HoloButton">
<ImageView
android:id="@+id/favicon"
- android:layout_width="20dip"
- android:layout_height="20dip"
+ android:layout_width="32dip"
+ android:layout_height="32dip"
+ android:paddingLeft="4dip"
+ android:paddingRight="8dip"
android:layout_gravity="center" />
<ImageView
android:id="@+id/lock"
android:layout_width="32dip"
- android:layout_height="33dip"
+ android:layout_height="32dip"
android:layout_gravity="center"
android:visibility="gone" />
</FrameLayout>
@@ -62,6 +66,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
+ android:paddingLeft="4dip"
android:contentDescription="@string/accessibility_button_stop"
android:src="@drawable/ic_stop_holo_dark"
style="@style/HoloButton" />
@@ -87,6 +92,7 @@
android:id="@+id/voice"
android:layout_width="wrap_content"
android:layout_height="match_parent"
+ android:paddingRight="4dip"
android:contentDescription="@string/accessibility_button_voice"
android:src="@drawable/ic_voice_search_holo_dark"
style="@style/HoloButton"
@@ -95,6 +101,7 @@
android:id="@+id/clear"
android:layout_width="wrap_content"
android:layout_height="match_parent"
+ android:paddingRight="4dip"
android:contentDescription="@string/accessibility_button_clear"
android:src="@drawable/ic_close_window_holo_dark"
style="@style/HoloButton"
diff --git a/res/mipmap-hdpi/ic_launcher_browser.png b/res/mipmap-hdpi/ic_launcher_browser.png
index 03a08e5..5680416 100644
--- a/res/mipmap-hdpi/ic_launcher_browser.png
+++ b/res/mipmap-hdpi/ic_launcher_browser.png
Binary files differ
