asset drop & naming
drop in new assets
get naming in sync with UX
Note: not all resources are included yet
item_background...xm will be enabled when all required resources come in
Change-Id: I321084abd25ef6c533f1f3da636a246e7ee00547
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index c95ce21..9514560 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -175,10 +175,6 @@
</intent-filter>
</activity>
- <activity android:name="SaveToHomescreenDialog" android:label="Save to homescreen" android:theme="@android:style/Theme.Dialog"
- android:configChanges="orientation|keyboardHidden" android:windowSoftInputMode="stateHidden">
- </activity>
-
<!-- Bookmark thumbnail homescreen widget -->
<receiver
android:name=".widget.BookmarkThumbnailWidgetProvider"
diff --git a/res/drawable-hdpi/bg_bookmark_widget_holo.9.png b/res/drawable-hdpi/bg_bookmark_widget_holo.9.png
index 0a3230e..adb57a4 100644
--- a/res/drawable-hdpi/bg_bookmark_widget_holo.9.png
+++ b/res/drawable-hdpi/bg_bookmark_widget_holo.9.png
Binary files differ
diff --git a/res/drawable-hdpi/browsertab_inactive.png b/res/drawable-hdpi/browsertab_inactive.png
new file mode 100644
index 0000000..60ebb2b
--- /dev/null
+++ b/res/drawable-hdpi/browsertab_inactive.png
Binary files differ
diff --git a/res/drawable-hdpi/btn_ic_back_bookmark_widget_holo_dark.png b/res/drawable-hdpi/btn_ic_back_bookmark_widget_holo_dark.png
index 65c565f..5f975e5 100644
--- a/res/drawable-hdpi/btn_ic_back_bookmark_widget_holo_dark.png
+++ b/res/drawable-hdpi/btn_ic_back_bookmark_widget_holo_dark.png
Binary files differ
diff --git a/res/drawable-hdpi/btn_ic_bookmark_bookmark_widget_holo_dark.png b/res/drawable-hdpi/btn_ic_bookmark_bookmark_widget_holo_dark.png
index b0e704a..722f3b8 100644
--- a/res/drawable-hdpi/btn_ic_bookmark_bookmark_widget_holo_dark.png
+++ b/res/drawable-hdpi/btn_ic_bookmark_bookmark_widget_holo_dark.png
Binary files differ
diff --git a/res/drawable-hdpi/divider_vert.9.png b/res/drawable-hdpi/divider_vert.9.png
deleted file mode 100644
index 2c5646e..0000000
--- a/res/drawable-hdpi/divider_vert.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_arrow_left.png b/res/drawable-hdpi/ic_arrow_left.png
deleted file mode 100644
index bcbe3f6..0000000
--- a/res/drawable-hdpi/ic_arrow_left.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_arrow_right.png b/res/drawable-hdpi/ic_arrow_right.png
deleted file mode 100644
index 6095533..0000000
--- a/res/drawable-hdpi/ic_arrow_right.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_back_disabled_holo_dark.png b/res/drawable-hdpi/ic_back_disabled_holo_dark.png
new file mode 100644
index 0000000..eca8a56
--- /dev/null
+++ b/res/drawable-hdpi/ic_back_disabled_holo_dark.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_back_hierarchy_holo_dark.png b/res/drawable-hdpi/ic_back_hierarchy_holo_dark.png
new file mode 100644
index 0000000..ed99557
--- /dev/null
+++ b/res/drawable-hdpi/ic_back_hierarchy_holo_dark.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_back_normal.png b/res/drawable-hdpi/ic_back_holo_dark.png
similarity index 78%
rename from res/drawable-hdpi/ic_back_normal.png
rename to res/drawable-hdpi/ic_back_holo_dark.png
index 852a146..5e31b19 100644
--- a/res/drawable-hdpi/ic_back_normal.png
+++ b/res/drawable-hdpi/ic_back_holo_dark.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_favorite_off_normal.png b/res/drawable-hdpi/ic_bookmark_off_holo_dark.png
similarity index 89%
rename from res/drawable-hdpi/ic_favorite_off_normal.png
rename to res/drawable-hdpi/ic_bookmark_off_holo_dark.png
index 6b3bfc4..9ec0a44 100644
--- a/res/drawable-hdpi/ic_favorite_off_normal.png
+++ b/res/drawable-hdpi/ic_bookmark_off_holo_dark.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_menu_add_bookmark.png b/res/drawable-hdpi/ic_bookmark_on_holo_dark.png
similarity index 83%
rename from res/drawable-hdpi/ic_menu_add_bookmark.png
rename to res/drawable-hdpi/ic_bookmark_on_holo_dark.png
index 7a3a9b1..1d67f1a 100644
--- a/res/drawable-hdpi/ic_menu_add_bookmark.png
+++ b/res/drawable-hdpi/ic_bookmark_on_holo_dark.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_bookmarks_history_normal.png b/res/drawable-hdpi/ic_bookmarks_history_holo_dark.png
similarity index 85%
rename from res/drawable-hdpi/ic_bookmarks_history_normal.png
rename to res/drawable-hdpi/ic_bookmarks_history_holo_dark.png
index ae6fee5..df527a2 100644
--- a/res/drawable-hdpi/ic_bookmarks_history_normal.png
+++ b/res/drawable-hdpi/ic_bookmarks_history_holo_dark.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_menu_bookmarks.png b/res/drawable-hdpi/ic_bookmarks_holo_dark.png
old mode 100755
new mode 100644
similarity index 84%
rename from res/drawable-hdpi/ic_menu_bookmarks.png
rename to res/drawable-hdpi/ic_bookmarks_holo_dark.png
index 1b2adfc..d3070bf
--- a/res/drawable-hdpi/ic_menu_bookmarks.png
+++ b/res/drawable-hdpi/ic_bookmarks_holo_dark.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_browser_bookmark_widget_holo.png b/res/drawable-hdpi/ic_browser_bookmark_widget_holo.png
index a43dc08..e583acd 100644
--- a/res/drawable-hdpi/ic_browser_bookmark_widget_holo.png
+++ b/res/drawable-hdpi/ic_browser_bookmark_widget_holo.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_btn_copy.png b/res/drawable-hdpi/ic_btn_copy.png
new file mode 100644
index 0000000..847cf7e
--- /dev/null
+++ b/res/drawable-hdpi/ic_btn_copy.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_btn_find.png b/res/drawable-hdpi/ic_btn_find.png
new file mode 100644
index 0000000..0da38a1
--- /dev/null
+++ b/res/drawable-hdpi/ic_btn_find.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_btn_select_all.png b/res/drawable-hdpi/ic_btn_select_all.png
new file mode 100644
index 0000000..9545a53
--- /dev/null
+++ b/res/drawable-hdpi/ic_btn_select_all.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_chevron.png b/res/drawable-hdpi/ic_chevron.png
new file mode 100644
index 0000000..96e1afb
--- /dev/null
+++ b/res/drawable-hdpi/ic_chevron.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_close_window_holo_dark.png b/res/drawable-hdpi/ic_close_window_holo_dark.png
new file mode 100644
index 0000000..d459352
--- /dev/null
+++ b/res/drawable-hdpi/ic_close_window_holo_dark.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_menu_downloads.png b/res/drawable-hdpi/ic_downloads_holo_dark.png
similarity index 81%
rename from res/drawable-hdpi/ic_menu_downloads.png
rename to res/drawable-hdpi/ic_downloads_holo_dark.png
index ebfe59b..ac2f6bd 100644
--- a/res/drawable-hdpi/ic_menu_downloads.png
+++ b/res/drawable-hdpi/ic_downloads_holo_dark.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_folder.9.png b/res/drawable-hdpi/ic_folder.9.png
deleted file mode 100644
index c1c9d54..0000000
--- a/res/drawable-hdpi/ic_folder.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_folder_bookmark_widget_holo_dark.png b/res/drawable-hdpi/ic_folder_bookmark_widget_holo_dark.png
deleted file mode 100644
index 3c6232f..0000000
--- a/res/drawable-hdpi/ic_folder_bookmark_widget_holo_dark.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_folder_holo_dark.png b/res/drawable-hdpi/ic_folder_holo_dark.png
new file mode 100644
index 0000000..139d79b
--- /dev/null
+++ b/res/drawable-hdpi/ic_folder_holo_dark.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_forward_disabled_holo_dark.png b/res/drawable-hdpi/ic_forward_disabled_holo_dark.png
new file mode 100644
index 0000000..9330b92
--- /dev/null
+++ b/res/drawable-hdpi/ic_forward_disabled_holo_dark.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_forward_normal.png b/res/drawable-hdpi/ic_forward_holo_dark.png
similarity index 78%
rename from res/drawable-hdpi/ic_forward_normal.png
rename to res/drawable-hdpi/ic_forward_holo_dark.png
index 2d0507b..d5a5fa7 100644
--- a/res/drawable-hdpi/ic_forward_normal.png
+++ b/res/drawable-hdpi/ic_forward_holo_dark.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_go_holo_dark.png b/res/drawable-hdpi/ic_go_holo_dark.png
new file mode 100644
index 0000000..b1412e8
--- /dev/null
+++ b/res/drawable-hdpi/ic_go_holo_dark.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_go_normal_white.png b/res/drawable-hdpi/ic_go_normal_white.png
deleted file mode 100644
index 1ae9ed9..0000000
--- a/res/drawable-hdpi/ic_go_normal_white.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_list_gps_denied.png b/res/drawable-hdpi/ic_gps_denied_holo_dark.png
similarity index 88%
rename from res/drawable-hdpi/ic_list_gps_denied.png
rename to res/drawable-hdpi/ic_gps_denied_holo_dark.png
index bfe8496..5bd9c39 100644
--- a/res/drawable-hdpi/ic_list_gps_denied.png
+++ b/res/drawable-hdpi/ic_gps_denied_holo_dark.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_list_gps_on.png b/res/drawable-hdpi/ic_gps_on_holo_dark.png
similarity index 89%
rename from res/drawable-hdpi/ic_list_gps_on.png
rename to res/drawable-hdpi/ic_gps_on_holo_dark.png
index 060dfce..e736362 100644
--- a/res/drawable-hdpi/ic_list_gps_on.png
+++ b/res/drawable-hdpi/ic_gps_on_holo_dark.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_history_holo_dark.png b/res/drawable-hdpi/ic_history_holo_dark.png
new file mode 100644
index 0000000..7972a81
--- /dev/null
+++ b/res/drawable-hdpi/ic_history_holo_dark.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_home.png b/res/drawable-hdpi/ic_home.png
deleted file mode 100644
index ef81d55..0000000
--- a/res/drawable-hdpi/ic_home.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_home_holo_dark.png b/res/drawable-hdpi/ic_home_holo_dark.png
new file mode 100644
index 0000000..f355507
--- /dev/null
+++ b/res/drawable-hdpi/ic_home_holo_dark.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_incognito_holo_dark.png b/res/drawable-hdpi/ic_incognito_holo_dark.png
new file mode 100644
index 0000000..8f7a9d4
--- /dev/null
+++ b/res/drawable-hdpi/ic_incognito_holo_dark.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_launcher_shortcut_browser_bookmark.png b/res/drawable-hdpi/ic_launcher_shortcut_browser_bookmark.png
new file mode 100644
index 0000000..7b2c680
--- /dev/null
+++ b/res/drawable-hdpi/ic_launcher_shortcut_browser_bookmark.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_list_bookmark.png b/res/drawable-hdpi/ic_list_bookmark.png
deleted file mode 100644
index 6b3bfc4..0000000
--- a/res/drawable-hdpi/ic_list_bookmark.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_list_view_holo_dark.png b/res/drawable-hdpi/ic_list_view_holo_dark.png
new file mode 100644
index 0000000..89d63de
--- /dev/null
+++ b/res/drawable-hdpi/ic_list_view_holo_dark.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_menu_downloads_normal.png b/res/drawable-hdpi/ic_menu_downloads_normal.png
deleted file mode 100644
index b1ef0fe..0000000
--- a/res/drawable-hdpi/ic_menu_downloads_normal.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_menu_incognito_normal.png b/res/drawable-hdpi/ic_menu_incognito_normal.png
deleted file mode 100644
index dbecf6f..0000000
--- a/res/drawable-hdpi/ic_menu_incognito_normal.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_menu_new_window.png b/res/drawable-hdpi/ic_menu_new_window.png
index 2871b1f..fa498e7 100644
--- a/res/drawable-hdpi/ic_menu_new_window.png
+++ b/res/drawable-hdpi/ic_menu_new_window.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_menu_pageinfo_normal.png b/res/drawable-hdpi/ic_menu_pageinfo_normal.png
deleted file mode 100644
index b783a65..0000000
--- a/res/drawable-hdpi/ic_menu_pageinfo_normal.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_menu_settings.png b/res/drawable-hdpi/ic_menu_settings.png
deleted file mode 100644
index 5d37db7..0000000
--- a/res/drawable-hdpi/ic_menu_settings.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_menu_settings_normal.png b/res/drawable-hdpi/ic_menu_settings_normal.png
deleted file mode 100644
index f07be97..0000000
--- a/res/drawable-hdpi/ic_menu_settings_normal.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_menu_share.png b/res/drawable-hdpi/ic_menu_share.png
deleted file mode 100644
index d80b520..0000000
--- a/res/drawable-hdpi/ic_menu_share.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_menu_share_normal.png b/res/drawable-hdpi/ic_menu_share_normal.png
deleted file mode 100644
index b50b58f..0000000
--- a/res/drawable-hdpi/ic_menu_share_normal.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_tab_most_visited_selected.png b/res/drawable-hdpi/ic_most_visited_holo_dark.png
similarity index 83%
rename from res/drawable-hdpi/ic_tab_most_visited_selected.png
rename to res/drawable-hdpi/ic_most_visited_holo_dark.png
index aac046c..bbb0bf6 100644
--- a/res/drawable-hdpi/ic_tab_most_visited_selected.png
+++ b/res/drawable-hdpi/ic_most_visited_holo_dark.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_list_new_window.png b/res/drawable-hdpi/ic_new_window_holo_dark.png
similarity index 76%
rename from res/drawable-hdpi/ic_list_new_window.png
rename to res/drawable-hdpi/ic_new_window_holo_dark.png
index 30bc7cc..bc4017a 100644
--- a/res/drawable-hdpi/ic_list_new_window.png
+++ b/res/drawable-hdpi/ic_new_window_holo_dark.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_menu_pageinfo.png b/res/drawable-hdpi/ic_pageinfo_holo_dark.png
similarity index 81%
rename from res/drawable-hdpi/ic_menu_pageinfo.png
rename to res/drawable-hdpi/ic_pageinfo_holo_dark.png
index c107122..39b8201 100644
--- a/res/drawable-hdpi/ic_menu_pageinfo.png
+++ b/res/drawable-hdpi/ic_pageinfo_holo_dark.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_pie_back.png b/res/drawable-hdpi/ic_pie_back.png
new file mode 100644
index 0000000..32b3ea7
--- /dev/null
+++ b/res/drawable-hdpi/ic_pie_back.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_pie_bookmarks.png b/res/drawable-hdpi/ic_pie_bookmarks.png
new file mode 100644
index 0000000..2536856
--- /dev/null
+++ b/res/drawable-hdpi/ic_pie_bookmarks.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_pie_close_tab.png b/res/drawable-hdpi/ic_pie_close_tab.png
new file mode 100644
index 0000000..108f8da
--- /dev/null
+++ b/res/drawable-hdpi/ic_pie_close_tab.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_pie_forward.png b/res/drawable-hdpi/ic_pie_forward.png
new file mode 100644
index 0000000..4e5f08e
--- /dev/null
+++ b/res/drawable-hdpi/ic_pie_forward.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_pie_more.png b/res/drawable-hdpi/ic_pie_more.png
new file mode 100644
index 0000000..0833ee2
--- /dev/null
+++ b/res/drawable-hdpi/ic_pie_more.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_pie_new_tab.png b/res/drawable-hdpi/ic_pie_new_tab.png
new file mode 100644
index 0000000..18f49ef
--- /dev/null
+++ b/res/drawable-hdpi/ic_pie_new_tab.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_pie_refresh.png b/res/drawable-hdpi/ic_pie_refresh.png
new file mode 100644
index 0000000..f0a5d7a
--- /dev/null
+++ b/res/drawable-hdpi/ic_pie_refresh.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_pie_search.png b/res/drawable-hdpi/ic_pie_search.png
new file mode 100644
index 0000000..f1c8825
--- /dev/null
+++ b/res/drawable-hdpi/ic_pie_search.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_pie_tabs.png b/res/drawable-hdpi/ic_pie_tabs.png
new file mode 100644
index 0000000..b941285
--- /dev/null
+++ b/res/drawable-hdpi/ic_pie_tabs.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_pressed.png b/res/drawable-hdpi/ic_pressed.png
deleted file mode 100644
index fd1c7d9..0000000
--- a/res/drawable-hdpi/ic_pressed.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_refresh_normal.png b/res/drawable-hdpi/ic_refresh_holo_dark.png
similarity index 88%
rename from res/drawable-hdpi/ic_refresh_normal.png
rename to res/drawable-hdpi/ic_refresh_holo_dark.png
index eb709b1..1da3ea8 100644
--- a/res/drawable-hdpi/ic_refresh_normal.png
+++ b/res/drawable-hdpi/ic_refresh_holo_dark.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_search_normal.png b/res/drawable-hdpi/ic_search_holo_dark.png
similarity index 88%
rename from res/drawable-hdpi/ic_search_normal.png
rename to res/drawable-hdpi/ic_search_holo_dark.png
index 8f1d84d..688ef5d 100644
--- a/res/drawable-hdpi/ic_search_normal.png
+++ b/res/drawable-hdpi/ic_search_holo_dark.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_secure.png b/res/drawable-hdpi/ic_secure_holo_dark.png
similarity index 83%
rename from res/drawable-hdpi/ic_secure.png
rename to res/drawable-hdpi/ic_secure_holo_dark.png
index 2a954ec..72a40dd 100644
--- a/res/drawable-hdpi/ic_secure.png
+++ b/res/drawable-hdpi/ic_secure_holo_dark.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_settings_holo_dark.png b/res/drawable-hdpi/ic_settings_holo_dark.png
new file mode 100644
index 0000000..ac3f40c
--- /dev/null
+++ b/res/drawable-hdpi/ic_settings_holo_dark.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_share_holo_dark.png b/res/drawable-hdpi/ic_share_holo_dark.png
new file mode 100644
index 0000000..2094394
--- /dev/null
+++ b/res/drawable-hdpi/ic_share_holo_dark.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_stop.png b/res/drawable-hdpi/ic_stop_holo_dark.png
similarity index 78%
rename from res/drawable-hdpi/ic_stop.png
rename to res/drawable-hdpi/ic_stop_holo_dark.png
index d31449a..e31dd22 100644
--- a/res/drawable-hdpi/ic_stop.png
+++ b/res/drawable-hdpi/ic_stop_holo_dark.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_stop_normal.png b/res/drawable-hdpi/ic_stop_normal.png
deleted file mode 100644
index d31449a..0000000
--- a/res/drawable-hdpi/ic_stop_normal.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_tab_bookmarks_selected.png b/res/drawable-hdpi/ic_tab_bookmarks_selected.png
deleted file mode 100644
index 1b2adfc..0000000
--- a/res/drawable-hdpi/ic_tab_bookmarks_selected.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_tab_bookmarks_unselected.png b/res/drawable-hdpi/ic_tab_bookmarks_unselected.png
deleted file mode 100644
index 95efcb1..0000000
--- a/res/drawable-hdpi/ic_tab_bookmarks_unselected.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_tab_history_selected.png b/res/drawable-hdpi/ic_tab_history_selected.png
deleted file mode 100644
index ae6fee5..0000000
--- a/res/drawable-hdpi/ic_tab_history_selected.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_tab_history_unselected.png b/res/drawable-hdpi/ic_tab_history_unselected.png
deleted file mode 100644
index 663ff46..0000000
--- a/res/drawable-hdpi/ic_tab_history_unselected.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_tab_most_visited_unselected.png b/res/drawable-hdpi/ic_tab_most_visited_unselected.png
deleted file mode 100644
index 6127920..0000000
--- a/res/drawable-hdpi/ic_tab_most_visited_unselected.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_voice_search_holo_dark.png b/res/drawable-hdpi/ic_voice_search_holo_dark.png
new file mode 100644
index 0000000..73bcafc
--- /dev/null
+++ b/res/drawable-hdpi/ic_voice_search_holo_dark.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_web_holo_dark.png b/res/drawable-hdpi/ic_web_holo_dark.png
new file mode 100644
index 0000000..d936c2c
--- /dev/null
+++ b/res/drawable-hdpi/ic_web_holo_dark.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_web_white.png b/res/drawable-hdpi/ic_web_white.png
deleted file mode 100644
index 3b0a2c2..0000000
--- a/res/drawable-hdpi/ic_web_white.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_menu_windows.png b/res/drawable-hdpi/ic_windows_holo_dark.png
similarity index 82%
rename from res/drawable-hdpi/ic_menu_windows.png
rename to res/drawable-hdpi/ic_windows_holo_dark.png
index 4b51161..98d5693 100644
--- a/res/drawable-hdpi/ic_menu_windows.png
+++ b/res/drawable-hdpi/ic_windows_holo_dark.png
Binary files differ
diff --git a/res/drawable-hdpi/list_div_bookmark_widget_holo.9.png b/res/drawable-hdpi/list_div_bookmark_widget_holo.9.png
deleted file mode 100644
index e0a983f..0000000
--- a/res/drawable-hdpi/list_div_bookmark_widget_holo.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/list_div_top_btm_bookmark_widget_holo.9.png b/res/drawable-hdpi/list_div_top_btm_bookmark_widget_holo.9.png
deleted file mode 100644
index 1bab8f1..0000000
--- a/res/drawable-hdpi/list_div_top_btm_bookmark_widget_holo.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/row_activated_bookmark_widget_holo.9.png b/res/drawable-hdpi/row_activated_bookmark_widget_holo.9.png
new file mode 100644
index 0000000..5af3f6a
--- /dev/null
+++ b/res/drawable-hdpi/row_activated_bookmark_widget_holo.9.png
Binary files differ
diff --git a/res/drawable-hdpi/stripes_overlay_bg_bookmark_widget_holo.png b/res/drawable-hdpi/stripes_overlay_bg_bookmark_widget_holo.png
deleted file mode 100644
index 46714bc..0000000
--- a/res/drawable-hdpi/stripes_overlay_bg_bookmark_widget_holo.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/suggest_item_press_holo.9.png b/res/drawable-hdpi/suggest_item_press_holo.9.png
deleted file mode 100644
index 2a6ff60..0000000
--- a/res/drawable-hdpi/suggest_item_press_holo.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/tab_selected_bg.9.png b/res/drawable-hdpi/tab_selected_bg.9.png
deleted file mode 100644
index 4e0f740..0000000
--- a/res/drawable-hdpi/tab_selected_bg.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/tab_unselected_bg.9.png b/res/drawable-hdpi/tab_unselected_bg.9.png
deleted file mode 100644
index 9ab7c56..0000000
--- a/res/drawable-hdpi/tab_unselected_bg.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/tabbar_bg.9.png b/res/drawable-hdpi/tabbar_bg.9.png
deleted file mode 100644
index 01dabd0..0000000
--- a/res/drawable-hdpi/tabbar_bg.9.png
+++ /dev/null
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
new file mode 100644
index 0000000..d023d75
--- /dev/null
+++ 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
new file mode 100644
index 0000000..39a16cc
--- /dev/null
+++ b/res/drawable-hdpi/textfield_default_holo_dark.9.png
Binary files differ
diff --git a/res/drawable-mdpi/browsertab_add.png b/res/drawable-mdpi/browsertab_add.png
index 868030c..f960c1d 100644
--- a/res/drawable-mdpi/browsertab_add.png
+++ b/res/drawable-mdpi/browsertab_add.png
Binary files differ
diff --git a/res/drawable-mdpi/divider_vert.9.png b/res/drawable-mdpi/divider_vert.9.png
deleted file mode 100644
index 2c5646e..0000000
--- a/res/drawable-mdpi/divider_vert.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_arrow_left.png b/res/drawable-mdpi/ic_arrow_left.png
deleted file mode 100644
index 58be4bd..0000000
--- a/res/drawable-mdpi/ic_arrow_left.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_arrow_right.png b/res/drawable-mdpi/ic_arrow_right.png
deleted file mode 100644
index 6272038..0000000
--- a/res/drawable-mdpi/ic_arrow_right.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_back_disabled_holo_dark.png b/res/drawable-mdpi/ic_back_disabled_holo_dark.png
new file mode 100644
index 0000000..aca4345
--- /dev/null
+++ b/res/drawable-mdpi/ic_back_disabled_holo_dark.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_back_hierarchy_holo_dark.png b/res/drawable-mdpi/ic_back_hierarchy_holo_dark.png
new file mode 100644
index 0000000..13d20ce
--- /dev/null
+++ b/res/drawable-mdpi/ic_back_hierarchy_holo_dark.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_back_normal.png b/res/drawable-mdpi/ic_back_holo_dark.png
similarity index 74%
rename from res/drawable-mdpi/ic_back_normal.png
rename to res/drawable-mdpi/ic_back_holo_dark.png
index b5147e0..8977423 100644
--- a/res/drawable-mdpi/ic_back_normal.png
+++ b/res/drawable-mdpi/ic_back_holo_dark.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_favorite_off_normal.png b/res/drawable-mdpi/ic_bookmark_off_holo_dark.png
similarity index 79%
rename from res/drawable-mdpi/ic_favorite_off_normal.png
rename to res/drawable-mdpi/ic_bookmark_off_holo_dark.png
index 482d3ef..7446bdf 100644
--- a/res/drawable-mdpi/ic_favorite_off_normal.png
+++ b/res/drawable-mdpi/ic_bookmark_off_holo_dark.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_menu_add_bookmark.png b/res/drawable-mdpi/ic_bookmark_on_holo_dark.png
similarity index 83%
rename from res/drawable-mdpi/ic_menu_add_bookmark.png
rename to res/drawable-mdpi/ic_bookmark_on_holo_dark.png
index c67c388..79a183f 100644
--- a/res/drawable-mdpi/ic_menu_add_bookmark.png
+++ b/res/drawable-mdpi/ic_bookmark_on_holo_dark.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_bookmarks_history_normal.png b/res/drawable-mdpi/ic_bookmarks_history_holo_dark.png
similarity index 74%
rename from res/drawable-mdpi/ic_bookmarks_history_normal.png
rename to res/drawable-mdpi/ic_bookmarks_history_holo_dark.png
index 425c94f..4933165 100644
--- a/res/drawable-mdpi/ic_bookmarks_history_normal.png
+++ b/res/drawable-mdpi/ic_bookmarks_history_holo_dark.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_menu_bookmarks.png b/res/drawable-mdpi/ic_bookmarks_holo_dark.png
old mode 100755
new mode 100644
similarity index 80%
rename from res/drawable-mdpi/ic_menu_bookmarks.png
rename to res/drawable-mdpi/ic_bookmarks_holo_dark.png
index 45a9d7c..ea45051
--- a/res/drawable-mdpi/ic_menu_bookmarks.png
+++ b/res/drawable-mdpi/ic_bookmarks_holo_dark.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_btn_share.png b/res/drawable-mdpi/ic_btn_share.png
deleted file mode 100644
index f75c247..0000000
--- a/res/drawable-mdpi/ic_btn_share.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_close_window_holo_dark.png b/res/drawable-mdpi/ic_close_window_holo_dark.png
new file mode 100644
index 0000000..9bb8e87
--- /dev/null
+++ b/res/drawable-mdpi/ic_close_window_holo_dark.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_menu_downloads.png b/res/drawable-mdpi/ic_downloads_holo_dark.png
similarity index 78%
rename from res/drawable-mdpi/ic_menu_downloads.png
rename to res/drawable-mdpi/ic_downloads_holo_dark.png
index fc233d5..8f01c41 100644
--- a/res/drawable-mdpi/ic_menu_downloads.png
+++ b/res/drawable-mdpi/ic_downloads_holo_dark.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_favorite_on_normal.png b/res/drawable-mdpi/ic_favorite_on_normal.png
deleted file mode 100644
index b086569..0000000
--- a/res/drawable-mdpi/ic_favorite_on_normal.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_folder.9.png b/res/drawable-mdpi/ic_folder.9.png
deleted file mode 100644
index 431aae8..0000000
--- a/res/drawable-mdpi/ic_folder.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_folder_bookmark_widget_holo_dark.png b/res/drawable-mdpi/ic_folder_bookmark_widget_holo_dark.png
deleted file mode 100644
index 910e9ec..0000000
--- a/res/drawable-mdpi/ic_folder_bookmark_widget_holo_dark.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_folder_holo_dark.png b/res/drawable-mdpi/ic_folder_holo_dark.png
new file mode 100644
index 0000000..a9bebb9
--- /dev/null
+++ b/res/drawable-mdpi/ic_folder_holo_dark.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_forward_disabled_holo_dark.png b/res/drawable-mdpi/ic_forward_disabled_holo_dark.png
new file mode 100644
index 0000000..5cd3f7f
--- /dev/null
+++ b/res/drawable-mdpi/ic_forward_disabled_holo_dark.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_forward_normal.png b/res/drawable-mdpi/ic_forward_holo_dark.png
similarity index 75%
rename from res/drawable-mdpi/ic_forward_normal.png
rename to res/drawable-mdpi/ic_forward_holo_dark.png
index f651ce6..7f60012 100644
--- a/res/drawable-mdpi/ic_forward_normal.png
+++ b/res/drawable-mdpi/ic_forward_holo_dark.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_go_holo_dark.png b/res/drawable-mdpi/ic_go_holo_dark.png
new file mode 100644
index 0000000..2e2a449
--- /dev/null
+++ b/res/drawable-mdpi/ic_go_holo_dark.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_go_normal_white.png b/res/drawable-mdpi/ic_go_normal_white.png
deleted file mode 100644
index 1ae9ed9..0000000
--- a/res/drawable-mdpi/ic_go_normal_white.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_list_gps_denied.png b/res/drawable-mdpi/ic_gps_denied_holo_dark.png
similarity index 83%
rename from res/drawable-mdpi/ic_list_gps_denied.png
rename to res/drawable-mdpi/ic_gps_denied_holo_dark.png
index 82f4470..3a48b47 100644
--- a/res/drawable-mdpi/ic_list_gps_denied.png
+++ b/res/drawable-mdpi/ic_gps_denied_holo_dark.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_list_gps_on.png b/res/drawable-mdpi/ic_gps_on_holo_dark.png
similarity index 83%
rename from res/drawable-mdpi/ic_list_gps_on.png
rename to res/drawable-mdpi/ic_gps_on_holo_dark.png
index 0f51460..505e29a 100644
--- a/res/drawable-mdpi/ic_list_gps_on.png
+++ b/res/drawable-mdpi/ic_gps_on_holo_dark.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_history_holo_dark.png b/res/drawable-mdpi/ic_history_holo_dark.png
new file mode 100644
index 0000000..44f2245
--- /dev/null
+++ b/res/drawable-mdpi/ic_history_holo_dark.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_home.png b/res/drawable-mdpi/ic_home.png
deleted file mode 100644
index 435e703..0000000
--- a/res/drawable-mdpi/ic_home.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_home_holo_dark.png b/res/drawable-mdpi/ic_home_holo_dark.png
new file mode 100644
index 0000000..8884eaa
--- /dev/null
+++ b/res/drawable-mdpi/ic_home_holo_dark.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_incognito_holo_dark.png b/res/drawable-mdpi/ic_incognito_holo_dark.png
new file mode 100644
index 0000000..e2e8b17
--- /dev/null
+++ b/res/drawable-mdpi/ic_incognito_holo_dark.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_launcher_shortcut_browser_bookmark.png b/res/drawable-mdpi/ic_launcher_shortcut_browser_bookmark.png
new file mode 100644
index 0000000..aa05683
--- /dev/null
+++ b/res/drawable-mdpi/ic_launcher_shortcut_browser_bookmark.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_list_bookmark.png b/res/drawable-mdpi/ic_list_bookmark.png
deleted file mode 100644
index 482d3ef..0000000
--- a/res/drawable-mdpi/ic_list_bookmark.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_list_view_holo_dark.png b/res/drawable-mdpi/ic_list_view_holo_dark.png
new file mode 100644
index 0000000..319635e
--- /dev/null
+++ b/res/drawable-mdpi/ic_list_view_holo_dark.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_menu_downloads_normal.png b/res/drawable-mdpi/ic_menu_downloads_normal.png
deleted file mode 100644
index 37b6b75..0000000
--- a/res/drawable-mdpi/ic_menu_downloads_normal.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_menu_incognito_normal.png b/res/drawable-mdpi/ic_menu_incognito_normal.png
deleted file mode 100644
index 2e78dc6..0000000
--- a/res/drawable-mdpi/ic_menu_incognito_normal.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_menu_pageinfo_normal.png b/res/drawable-mdpi/ic_menu_pageinfo_normal.png
deleted file mode 100644
index 3422e98..0000000
--- a/res/drawable-mdpi/ic_menu_pageinfo_normal.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_menu_settings.png b/res/drawable-mdpi/ic_menu_settings.png
deleted file mode 100644
index 87eb1db..0000000
--- a/res/drawable-mdpi/ic_menu_settings.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_menu_settings_normal.png b/res/drawable-mdpi/ic_menu_settings_normal.png
deleted file mode 100644
index bd2c30a..0000000
--- a/res/drawable-mdpi/ic_menu_settings_normal.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_menu_share.png b/res/drawable-mdpi/ic_menu_share.png
deleted file mode 100644
index ca1dae0..0000000
--- a/res/drawable-mdpi/ic_menu_share.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_menu_share_normal.png b/res/drawable-mdpi/ic_menu_share_normal.png
deleted file mode 100644
index 4410baa..0000000
--- a/res/drawable-mdpi/ic_menu_share_normal.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_tab_most_visited_selected.png b/res/drawable-mdpi/ic_most_visited_holo_dark.png
similarity index 100%
rename from res/drawable-mdpi/ic_tab_most_visited_selected.png
rename to res/drawable-mdpi/ic_most_visited_holo_dark.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_list_new_window.png b/res/drawable-mdpi/ic_new_window_holo_dark.png
similarity index 72%
rename from res/drawable-mdpi/ic_list_new_window.png
rename to res/drawable-mdpi/ic_new_window_holo_dark.png
index 08d9ba7..b16aacc 100644
--- a/res/drawable-mdpi/ic_list_new_window.png
+++ b/res/drawable-mdpi/ic_new_window_holo_dark.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_menu_pageinfo.png b/res/drawable-mdpi/ic_pageinfo_holo_dark.png
similarity index 78%
rename from res/drawable-mdpi/ic_menu_pageinfo.png
rename to res/drawable-mdpi/ic_pageinfo_holo_dark.png
index adc94ce..fd9b1c0 100644
--- a/res/drawable-mdpi/ic_menu_pageinfo.png
+++ b/res/drawable-mdpi/ic_pageinfo_holo_dark.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_pressed.png b/res/drawable-mdpi/ic_pressed.png
deleted file mode 100644
index fd1c7d9..0000000
--- a/res/drawable-mdpi/ic_pressed.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_refresh_normal.png b/res/drawable-mdpi/ic_refresh_holo_dark.png
similarity index 83%
rename from res/drawable-mdpi/ic_refresh_normal.png
rename to res/drawable-mdpi/ic_refresh_holo_dark.png
index f0dc6bd..0aec8a0 100644
--- a/res/drawable-mdpi/ic_refresh_normal.png
+++ b/res/drawable-mdpi/ic_refresh_holo_dark.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_search_normal.png b/res/drawable-mdpi/ic_search_holo_dark.png
similarity index 83%
rename from res/drawable-mdpi/ic_search_normal.png
rename to res/drawable-mdpi/ic_search_holo_dark.png
index 8fdd979..a84edf3 100644
--- a/res/drawable-mdpi/ic_search_normal.png
+++ b/res/drawable-mdpi/ic_search_holo_dark.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_search_light.png b/res/drawable-mdpi/ic_search_light.png
deleted file mode 100644
index 7cc6069..0000000
--- a/res/drawable-mdpi/ic_search_light.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_secure.png b/res/drawable-mdpi/ic_secure_holo_dark.png
similarity index 78%
rename from res/drawable-mdpi/ic_secure.png
rename to res/drawable-mdpi/ic_secure_holo_dark.png
index ab61331..7b10b65 100644
--- a/res/drawable-mdpi/ic_secure.png
+++ b/res/drawable-mdpi/ic_secure_holo_dark.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_settings_holo_dark.png b/res/drawable-mdpi/ic_settings_holo_dark.png
new file mode 100644
index 0000000..2ab07c4
--- /dev/null
+++ b/res/drawable-mdpi/ic_settings_holo_dark.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_share_holo_dark.png b/res/drawable-mdpi/ic_share_holo_dark.png
new file mode 100644
index 0000000..d02cbad
--- /dev/null
+++ b/res/drawable-mdpi/ic_share_holo_dark.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_stop.png b/res/drawable-mdpi/ic_stop.png
deleted file mode 100644
index 25b5338..0000000
--- a/res/drawable-mdpi/ic_stop.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_clear_search_light.png b/res/drawable-mdpi/ic_stop_holo_dark.png
similarity index 74%
rename from res/drawable-mdpi/ic_clear_search_light.png
rename to res/drawable-mdpi/ic_stop_holo_dark.png
index 0d074c9..61edb02 100644
--- a/res/drawable-mdpi/ic_clear_search_light.png
+++ b/res/drawable-mdpi/ic_stop_holo_dark.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_stop_normal.png b/res/drawable-mdpi/ic_stop_normal.png
deleted file mode 100644
index 25b5338..0000000
--- a/res/drawable-mdpi/ic_stop_normal.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_tab_bookmarks_selected.png b/res/drawable-mdpi/ic_tab_bookmarks_selected.png
deleted file mode 100644
index 45a9d7c..0000000
--- a/res/drawable-mdpi/ic_tab_bookmarks_selected.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_tab_bookmarks_unselected.png b/res/drawable-mdpi/ic_tab_bookmarks_unselected.png
deleted file mode 100644
index 598b098..0000000
--- a/res/drawable-mdpi/ic_tab_bookmarks_unselected.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_tab_history_selected.png b/res/drawable-mdpi/ic_tab_history_selected.png
deleted file mode 100644
index 425c94f..0000000
--- a/res/drawable-mdpi/ic_tab_history_selected.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_tab_history_unselected.png b/res/drawable-mdpi/ic_tab_history_unselected.png
deleted file mode 100644
index df6b14b..0000000
--- a/res/drawable-mdpi/ic_tab_history_unselected.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_tab_most_visited_unselected.png b/res/drawable-mdpi/ic_tab_most_visited_unselected.png
deleted file mode 100644
index 105ff2e..0000000
--- a/res/drawable-mdpi/ic_tab_most_visited_unselected.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_voice_search.png b/res/drawable-mdpi/ic_voice_search_holo_dark.png
similarity index 81%
rename from res/drawable-mdpi/ic_voice_search.png
rename to res/drawable-mdpi/ic_voice_search_holo_dark.png
index 48dc94e..e7e4f68 100644
--- a/res/drawable-mdpi/ic_voice_search.png
+++ b/res/drawable-mdpi/ic_voice_search_holo_dark.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_web_holo_dark.png b/res/drawable-mdpi/ic_web_holo_dark.png
new file mode 100644
index 0000000..fcf6785
--- /dev/null
+++ b/res/drawable-mdpi/ic_web_holo_dark.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_web_white.png b/res/drawable-mdpi/ic_web_white.png
deleted file mode 100644
index 3347791..0000000
--- a/res/drawable-mdpi/ic_web_white.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_menu_windows.png b/res/drawable-mdpi/ic_windows_holo_dark.png
similarity index 79%
rename from res/drawable-mdpi/ic_menu_windows.png
rename to res/drawable-mdpi/ic_windows_holo_dark.png
index 0f77fff..7eabd08 100644
--- a/res/drawable-mdpi/ic_menu_windows.png
+++ b/res/drawable-mdpi/ic_windows_holo_dark.png
Binary files differ
diff --git a/res/drawable-mdpi/list_div_bookmark_widget_holo.9.png b/res/drawable-mdpi/list_div_bookmark_widget_holo.9.png
deleted file mode 100644
index 2fdb639..0000000
--- a/res/drawable-mdpi/list_div_bookmark_widget_holo.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/list_div_top_btm_bookmark_widget_holo.9.png b/res/drawable-mdpi/list_div_top_btm_bookmark_widget_holo.9.png
deleted file mode 100644
index 04861ce..0000000
--- a/res/drawable-mdpi/list_div_top_btm_bookmark_widget_holo.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/suggest_item_press_holo.9.png b/res/drawable-mdpi/row_activated_bookmark_widget_holo.9.png
similarity index 66%
rename from res/drawable-mdpi/suggest_item_press_holo.9.png
rename to res/drawable-mdpi/row_activated_bookmark_widget_holo.9.png
index 2e8874e..ed8760f 100644
--- a/res/drawable-mdpi/suggest_item_press_holo.9.png
+++ b/res/drawable-mdpi/row_activated_bookmark_widget_holo.9.png
Binary files differ
diff --git a/res/drawable-mdpi/stripes_overlay_bg_bookmark_widget_holo.png b/res/drawable-mdpi/stripes_overlay_bg_bookmark_widget_holo.png
deleted file mode 100644
index 6b387a0..0000000
--- a/res/drawable-mdpi/stripes_overlay_bg_bookmark_widget_holo.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/tab_selected_bg.9.png b/res/drawable-mdpi/tab_selected_bg.9.png
deleted file mode 100644
index 261982e..0000000
--- a/res/drawable-mdpi/tab_selected_bg.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/tab_unselected_bg.9.png b/res/drawable-mdpi/tab_unselected_bg.9.png
deleted file mode 100644
index 5d483e0..0000000
--- a/res/drawable-mdpi/tab_unselected_bg.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/tabbar_bg.9.png b/res/drawable-mdpi/tabbar_bg.9.png
deleted file mode 100644
index bb9928d..0000000
--- a/res/drawable-mdpi/tabbar_bg.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable/browser_bookmark_tab.xml b/res/drawable/browser_bookmark_tab.xml
deleted file mode 100644
index 49b66c7..0000000
--- a/res/drawable/browser_bookmark_tab.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2009 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
- <item android:state_selected="true" android:drawable="@drawable/ic_tab_bookmarks_selected"/>
- <item android:state_selected="false" android:drawable="@drawable/ic_tab_bookmarks_unselected"/>
-</selector>
-
diff --git a/res/drawable/browser_history_tab.xml b/res/drawable/browser_history_tab.xml
deleted file mode 100644
index 1fbd0ce..0000000
--- a/res/drawable/browser_history_tab.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2009 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
- <item android:state_selected="true" android:drawable="@drawable/ic_tab_history_selected"/>
- <item android:state_selected="false" android:drawable="@drawable/ic_tab_history_unselected"/>
-</selector>
-
diff --git a/res/drawable/browser_visited_tab.xml b/res/drawable/browser_visited_tab.xml
deleted file mode 100644
index b9d6eb7..0000000
--- a/res/drawable/browser_visited_tab.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2009 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
- <item android:state_selected="true" android:drawable="@drawable/ic_tab_most_visited_selected"/>
- <item android:state_selected="false" android:drawable="@drawable/ic_tab_most_visited_unselected"/>
-</selector>
-
diff --git a/res/drawable/browserbarbutton.xml b/res/drawable/browserbarbutton.xml
deleted file mode 100644
index d3eebbe..0000000
--- a/res/drawable/browserbarbutton.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2010 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
- <item android:state_pressed="true"
- android:drawable="@drawable/ic_pressed" />
- <item android:state_pressed="false" android:drawable="@drawable/clear" />
-</selector>
diff --git a/res/drawable/btn_checkbox_star.xml b/res/drawable/btn_checkbox_star.xml
index 9635dad..08a8699 100644
--- a/res/drawable/btn_checkbox_star.xml
+++ b/res/drawable/btn_checkbox_star.xml
@@ -16,7 +16,7 @@
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_checked="true"
- android:drawable="@drawable/ic_favorite_on_normal" />
+ android:drawable="@drawable/ic_bookmark_on_holo_dark" />
<item android:state_checked="false"
- android:drawable="@drawable/ic_favorite_off_normal" />
+ android:drawable="@drawable/ic_bookmark_off_holo_dark" />
</selector>
diff --git a/res/drawable/btn_imageview_star.xml b/res/drawable/btn_imageview_star.xml
index 4c3d145..c1bfb5d 100644
--- a/res/drawable/btn_imageview_star.xml
+++ b/res/drawable/btn_imageview_star.xml
@@ -16,7 +16,7 @@
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_activated="true"
- android:drawable="@drawable/ic_favorite_on_normal" />
+ android:drawable="@drawable/ic_bookmark_on_holo_dark" />
<item android:state_activated="false"
- android:drawable="@drawable/ic_favorite_off_normal" />
+ android:drawable="@drawable/ic_bookmark_off_holo_dark" />
</selector>
diff --git a/res/drawable/ic_menu_incognito.png b/res/drawable/ic_menu_incognito.png
deleted file mode 100644
index d5a7022..0000000
--- a/res/drawable/ic_menu_incognito.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable/item_background_holo_dark.xm b/res/drawable/item_background_holo_dark.xm
new file mode 100644
index 0000000..d5fa3c0
--- /dev/null
+++ b/res/drawable/item_background_holo_dark.xm
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2011 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<selector
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ android:exitFadeDuration="@android:integer/config_mediumAnimTime">
+ <item
+ android:state_window_focused="false"
+ android:drawable="@color/transparent" />
+ <!--
+ Even though these two point to the same resource, have two states so the
+ drawable will invalidate itself when coming out of pressed state.
+ -->
+ <item
+ android:state_focused="true"
+ android:state_enabled="false"
+ android:state_pressed="true"
+ android:drawable="@drawable/list_selector_disabled_holo_dark" />
+ <item
+ android:state_focused="true"
+ android:state_enabled="false"
+ android:drawable="@drawable/list_selector_disabled_holo_dark" />
+ <item
+ android:state_focused="true"
+ android:state_pressed="true"
+ android:drawable="@drawable/list_selector_background_transition_holo_dark" />
+ <item
+ android:state_focused="false"
+ android:state_pressed="true"
+ android:drawable="@drawable/list_selector_background_transition_holo_dark" />
+ <item
+ android:state_focused="true"
+ android:drawable="@drawable/list_focused_holo" />
+ <item
+ android:drawable="@color/transparent" />
+</selector>
\ No newline at end of file
diff --git a/res/drawable/suggest_item_selector.xml b/res/drawable/suggest_item_selector.xml
index 1184e5b..301584f 100644
--- a/res/drawable/suggest_item_selector.xml
+++ b/res/drawable/suggest_item_selector.xml
@@ -17,6 +17,6 @@
<selector xmlns:android="http://schemas.android.com/apk/res/android"
android:exitFadeDuration="@android:integer/config_mediumAnimTime">
<item android:state_pressed="true"
- android:drawable="@drawable/suggest_item_press_holo" />
+ android:drawable="@drawable/row_activated_bookmark_widget_holo" />
<item android:state_pressed="false" android:drawable="@drawable/clear" />
</selector>
diff --git a/res/drawable/tab_background.xml b/res/drawable/tab_background.xml
deleted file mode 100644
index 6fc3ee3..0000000
--- a/res/drawable/tab_background.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2010 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-
-<selector
- xmlns:android="http://schemas.android.com/apk/res/android">
- <item
- android:state_activated="true"
- android:drawable="@drawable/tab_selected_bg" />
- <item
- android:state_activated="false"
- android:drawable="@drawable/tab_unselected_bg">
- </item>
-</selector>
diff --git a/res/layout/add_new_bookmark.xml b/res/layout/add_new_bookmark.xml
index d11a68a..53f7554 100644
--- a/res/layout/add_new_bookmark.xml
+++ b/res/layout/add_new_bookmark.xml
@@ -31,7 +31,7 @@
android:layout_marginLeft="5dip"
android:layout_marginRight="11dip"
android:focusable="false"
- android:src="@drawable/ic_list_bookmark"
+ android:src="@drawable/ic_bookmark_on_holo_dark"
android:scaleType="fitCenter"
/>
<LinearLayout
diff --git a/res/layout/browser_add_bookmark.xml b/res/layout/browser_add_bookmark.xml
index df46be5..f5c09a9 100644
--- a/res/layout/browser_add_bookmark.xml
+++ b/res/layout/browser_add_bookmark.xml
@@ -69,7 +69,7 @@
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:gravity="center_vertical"
- android:drawableLeft="@drawable/ic_list_bookmark"
+ android:drawableLeft="@drawable/ic_bookmark_on_holo_dark"
android:text="@string/bookmark_this_page"
android:textAppearance="?android:attr/textAppearanceMedium" />
<ImageView android:id="@+id/remove_divider"
diff --git a/res/layout/folder_list_item.xml b/res/layout/folder_list_item.xml
index 5d77fd9..46cda37 100644
--- a/res/layout/folder_list_item.xml
+++ b/res/layout/folder_list_item.xml
@@ -25,7 +25,7 @@
android:layout_height="wrap_content"
android:gravity="center_vertical"
android:minHeight="?android:attr/listPreferredItemHeight"
- android:src="@drawable/ic_folder_bookmark_widget_holo_dark" />
+ android:src="@drawable/ic_folder_holo_dark" />
<TextView
android:id="@android:id/text1"
android:layout_width="match_parent"
diff --git a/res/layout/new_folder_layout.xml b/res/layout/new_folder_layout.xml
index ecc730f..230dd3d 100644
--- a/res/layout/new_folder_layout.xml
+++ b/res/layout/new_folder_layout.xml
@@ -26,7 +26,7 @@
android:layout_height="wrap_content"
android:gravity="center_vertical"
android:minHeight="?android:attr/listPreferredItemHeight"
- android:src="@drawable/ic_folder_bookmark_widget_holo_dark" />
+ android:src="@drawable/ic_folder_holo_dark" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
diff --git a/res/layout/suggestion_item.xml b/res/layout/suggestion_item.xml
index d3a2404..b85911f 100644
--- a/res/layout/suggestion_item.xml
+++ b/res/layout/suggestion_item.xml
@@ -63,10 +63,10 @@
</LinearLayout>
<ImageView
android:layout_width="wrap_content"
- android:layout_height="wrap_content"
+ android:layout_height="match_parent"
android:id="@+id/divider"
android:scaleType="center"
- android:src="@drawable/divider_vert"
+ android:background="@*android:drawable/list_divider_holo_light"
/>
<ImageView
android:layout_width="wrap_content"
@@ -74,7 +74,7 @@
android:id="@+id/icon2"
android:scaleType="center"
android:src="@drawable/ic_add_string"
- android:background="@drawable/browserbarbutton"
+ android:background="?android:attr/activatedBackgroundIndicator"
style="@style/HoloButton"
android:layout_marginRight="16dip"
/>
diff --git a/res/layout/tab_title.xml b/res/layout/tab_title.xml
index ce3f987..164e9b6 100644
--- a/res/layout/tab_title.xml
+++ b/res/layout/tab_title.xml
@@ -59,7 +59,7 @@
android:singleLine="true" />
<ImageButton
android:id="@+id/close"
- android:background="@drawable/browserbarbutton"
+ android:background="?android:attr/selectableItemBackground"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginRight="16dip"
diff --git a/res/layout/tab_view_add_incognito_tab.xml b/res/layout/tab_view_add_incognito_tab.xml
index d07b4f5..43fcb43 100644
--- a/res/layout/tab_view_add_incognito_tab.xml
+++ b/res/layout/tab_view_add_incognito_tab.xml
@@ -26,7 +26,7 @@
android:layout_height="40dip"
android:layout_marginLeft="8dip"
android:layout_marginRight="8dip"
- android:src="@drawable/ic_list_new_window"/>
+ android:src="@drawable/ic_new_window_holo_dark"/>
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
diff --git a/res/layout/tab_view_add_tab.xml b/res/layout/tab_view_add_tab.xml
index f69865e..f4e0f02 100644
--- a/res/layout/tab_view_add_tab.xml
+++ b/res/layout/tab_view_add_tab.xml
@@ -26,7 +26,7 @@
android:layout_height="40dip"
android:layout_marginLeft="8dip"
android:layout_marginRight="8dip"
- android:src="@drawable/ic_list_new_window"/>
+ android:src="@drawable/ic_new_window_holo_dark"/>
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
diff --git a/res/layout/title_bar.xml b/res/layout/title_bar.xml
index a7e50b7..9bfba35 100644
--- a/res/layout/title_bar.xml
+++ b/res/layout/title_bar.xml
@@ -88,7 +88,7 @@
android:layout_marginRight="-5dip"
android:scaleType="center"
android:background="@drawable/btn_bookmark"
- android:src="@drawable/ic_list_bookmark"
+ android:src="@drawable/ic_bookmark_on_holo_dark"
/>
</LinearLayout>
</LinearLayout>
diff --git a/res/layout/url_bar.xml b/res/layout/url_bar.xml
index c619e64..5a6a4d3 100644
--- a/res/layout/url_bar.xml
+++ b/res/layout/url_bar.xml
@@ -24,13 +24,13 @@
android:background="@drawable/bg_urlbar">
<ImageButton
android:id="@+id/back"
- android:src="@drawable/ic_back_normal"
+ android:src="@drawable/ic_back_holo_dark"
android:layout_width="wrap_content"
android:layout_height="match_parent"
style="@style/HoloButton" />
<ImageButton
android:id="@+id/forward"
- android:src="@drawable/ic_forward_normal"
+ android:src="@drawable/ic_forward_holo_dark"
android:layout_width="wrap_content"
android:layout_height="match_parent"
style="@style/HoloButton" />
@@ -40,7 +40,7 @@
android:layout_height="match_parent"
style="@style/HoloButton"
android:gravity="center_vertical"
- android:src="@drawable/ic_stop_normal" />
+ android:src="@drawable/ic_stop_holo_dark" />
<LinearLayout
android:id="@+id/urlbar_focused"
android:layout_width="0dip"
@@ -53,7 +53,7 @@
android:id="@+id/voice_icon"
android:layout_width="wrap_content"
android:layout_height="match_parent"
- android:src="@drawable/ic_search_light"
+ android:src="@drawable/ic_search_holo_dark"
style="@style/HoloIcon"
android:visibility="gone" />
<ImageView
@@ -89,14 +89,14 @@
style="@style/HoloButton" />
<ImageView
android:id="@+id/clear"
- android:src="@drawable/ic_clear_search_light"
+ android:src="@drawable/ic_stop_holo_dark"
android:layout_width="wrap_content"
android:layout_height="match_parent"
style="@style/HoloButton" />
</LinearLayout>
<ImageButton
android:id="@+id/go"
- android:src="@drawable/ic_go_normal_white"
+ android:src="@drawable/ic_go_holo_dark"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:visibility="gone"
@@ -104,13 +104,13 @@
style="@style/HoloButton" />
<ImageView
android:id="@+id/voicesearch"
- android:src="@drawable/ic_voice_search"
+ android:src="@drawable/ic_voice_search_holo_dark"
android:layout_width="wrap_content"
android:layout_height="match_parent"
style="@style/HoloButton" />
<ImageButton
android:id="@+id/search"
- android:src="@drawable/ic_search_normal"
+ android:src="@drawable/ic_search_holo_dark"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:gravity="center_vertical"
@@ -122,7 +122,7 @@
android:layout_marginRight="4dip"
android:scaleType="center"
style="@style/HoloButton"
- android:src="@drawable/ic_bookmarks_history_normal" />
+ android:src="@drawable/ic_bookmarks_history_holo_dark" />
</LinearLayout>
<com.android.browser.PageProgressView
android:id="@+id/progress"
diff --git a/res/menu-xlarge/browser.xml b/res/menu-xlarge/browser.xml
index a4dc72c..bd255ae 100644
--- a/res/menu-xlarge/browser.xml
+++ b/res/menu-xlarge/browser.xml
@@ -23,26 +23,26 @@
android:alphabeticShortcut="n" />
<item android:id="@+id/incognito_menu_id"
android:title="@string/new_incognito_tab"
- android:icon="@drawable/ic_menu_incognito_normal" />
+ android:icon="@drawable/ic_incognito_holo_dark" />
<item android:id="@+id/find_menu_id"
android:title="@*android:string/find_on_page"
android:icon="@drawable/ic_menu_findonpage_normal"
android:alphabeticShortcut="f" />
<item android:id="@+id/share_page_menu_id"
android:title="@string/share_page"
- android:icon="@drawable/ic_menu_share_normal"
+ android:icon="@drawable/ic_share_holo_dark"
android:alphabeticShortcut="s" />
<item android:id="@+id/page_info_menu_id"
android:title="@string/page_info"
- android:icon="@drawable/ic_menu_pageinfo_normal"
+ android:icon="@drawable/ic_pageinfo_holo_dark"
android:alphabeticShortcut="g" />
<item android:id="@+id/view_downloads_menu_id"
android:title="@string/menu_view_download"
- android:icon="@drawable/ic_menu_downloads_normal"
+ android:icon="@drawable/ic_downloads_holo_dark"
android:alphabeticShortcut="d" />
<item android:id="@+id/preferences_menu_id"
android:title="@string/menu_preferences"
- android:icon="@drawable/ic_menu_settings_normal"
+ android:icon="@drawable/ic_settings_holo_dark"
android:alphabeticShortcut="p" />
<!-- followings are debug only -->
<item android:id="@+id/dump_nav_menu_id"
diff --git a/res/menu/bookmark.xml b/res/menu/bookmark.xml
index 4055b5e..b761779 100644
--- a/res/menu/bookmark.xml
+++ b/res/menu/bookmark.xml
@@ -17,12 +17,12 @@
<menu xmlns:android="http://schemas.android.com/apk/res/android">
<item
android:id="@+id/add_bookmark"
- android:icon="@drawable/ic_favorite_off_normal"
+ android:icon="@drawable/ic_bookmark_off_holo_dark"
android:title="@string/add_new_bookmark"
android:showAsAction="always|withText" />
<item
android:id="@+id/go_home"
- android:icon="@drawable/ic_home"
+ android:icon="@drawable/ic_home_holo_dark"
android:showAsAction="always" />
<item
android:id="@+id/thumbnail_view"
diff --git a/res/menu/browser.xml b/res/menu/browser.xml
index e00ee26..594681a 100644
--- a/res/menu/browser.xml
+++ b/res/menu/browser.xml
@@ -23,11 +23,11 @@
<item android:id="@+id/bookmarks_menu_id"
android:title="@string/bookmarks"
android:alphabeticShortcut="b"
- android:icon="@drawable/ic_menu_bookmarks"
+ android:icon="@drawable/ic_bookmarks_holo_dark"
/>
<item android:id="@+id/active_tabs_menu_id"
android:title="@string/active_tabs"
- android:icon="@drawable/ic_menu_windows"
+ android:icon="@drawable/ic_windows_holo_dark"
android:alphabeticShortcut="t" />
<item android:id="@+id/stop_reload_menu_id"
android:alphabeticShortcut="r" />
@@ -37,7 +37,7 @@
android:icon="@*android:drawable/ic_menu_forward" />
<item android:id="@+id/add_bookmark_menu_id"
android:title="@string/save_to_bookmarks"
- android:icon="@drawable/ic_menu_add_bookmark"
+ android:icon="@drawable/ic_bookmark_on_holo_dark"
android:alphabeticShortcut="a" />
<item android:id="@+id/find_menu_id"
android:title="@*android:string/find_on_page"
@@ -45,19 +45,19 @@
android:alphabeticShortcut="f" />
<item android:id="@+id/share_page_menu_id"
android:title="@string/share_page"
- android:icon="@drawable/ic_menu_share"
+ android:icon="@drawable/ic_share_holo_dark"
android:alphabeticShortcut="s" />
<item android:id="@+id/page_info_menu_id"
android:title="@string/page_info"
- android:icon="@drawable/ic_menu_pageinfo"
+ android:icon="@drawable/ic_pageinfo_holo_dark"
android:alphabeticShortcut="g" />
<item android:id="@+id/view_downloads_menu_id"
android:title="@string/menu_view_download"
- android:icon="@drawable/ic_menu_downloads"
+ android:icon="@drawable/ic_downloads_holo_dark"
android:alphabeticShortcut="d" />
<item android:id="@+id/preferences_menu_id"
android:title="@string/menu_preferences"
- android:icon="@drawable/ic_menu_settings"
+ android:icon="@drawable/ic_settings_holo_dark"
android:alphabeticShortcut="p" />
<!-- followings are debug only -->
<item android:id="@+id/dump_nav_menu_id"
diff --git a/res/menu/history.xml b/res/menu/history.xml
index f2ab299..5b029b5 100644
--- a/res/menu/history.xml
+++ b/res/menu/history.xml
@@ -20,6 +20,6 @@
android:icon="@android:drawable/ic_menu_close_clear_cancel" />
<item android:id="@+id/preferences_menu_id"
android:title="@string/menu_preferences"
- android:icon="@drawable/ic_menu_settings"
+ android:icon="@drawable/ic_settings_holo_dark"
android:alphabeticShortcut="p" />
</menu>
diff --git a/res/menu/url_selection.xml b/res/menu/url_selection.xml
index 1bb6d0e..8f4a93c 100644
--- a/res/menu/url_selection.xml
+++ b/res/menu/url_selection.xml
@@ -16,7 +16,7 @@
<menu xmlns:android="http://schemas.android.com/apk/res/android">
<item android:id="@+id/share"
- android:icon="@drawable/ic_menu_share_normal"
+ android:icon="@drawable/ic_share_holo_dark"
android:title="@string/menu_share_url"
android:showAsAction="always|withText"
/>
diff --git a/res/values-xlarge/styles.xml b/res/values-xlarge/styles.xml
index f20fd30..473b170 100644
--- a/res/values-xlarge/styles.xml
+++ b/res/values-xlarge/styles.xml
@@ -48,7 +48,7 @@
<item name="android:displayOptions"></item>
</style>
<style name="ActionButton">
- <item name="android:background">@drawable/browserbarbutton</item>
+ <item name="android:background">?android:attr/selectableItemBackground</item>
</style>
<style name="Suggestions" parent="@android:style/Widget.Holo.Light.AutoCompleteTextView">
</style>
diff --git a/res/values/dimensions.xml b/res/values/dimensions.xml
index 1e90c34..d738288 100644
--- a/res/values/dimensions.xml
+++ b/res/values/dimensions.xml
@@ -18,7 +18,8 @@
<dimen name="tab_width_unselected">240dp</dimen>
<dimen name="tab_height">44dp</dimen>
<dimen name="tab_overlap">8dp</dimen>
- <dimen name="tab_slice">18dp</dimen>
+ <dimen name="tab_addoverlap">14dp</dimen>
+ <dimen name="tab_slice">15.5dp</dimen>
<dimen name="tab_padding">16dp</dimen>
<dimen name="max_tab_width">300dp</dimen>
<dimen name="bookmarkThumbnailWidth">90dip</dimen>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 9df1c3a..758df9f 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -44,7 +44,7 @@
<item name="android:layout_marginLeft">16dip</item>
</style>
<style name="HoloButton" parent="@style/HoloIcon">
- <item name="android:background">@drawable/browserbarbutton</item>
+ <item name="android:background">?android:attr/selectableItemBackground</item>
</style>
<style name="TabTitleSelected" parent="@android:style/TextAppearance.Small">
<item name="android:textColor">?android:attr/textColorPrimary</item>
diff --git a/src/com/android/browser/AddBookmarkPage.java b/src/com/android/browser/AddBookmarkPage.java
index ee080ca..1444862 100644
--- a/src/com/android/browser/AddBookmarkPage.java
+++ b/src/com/android/browser/AddBookmarkPage.java
@@ -684,7 +684,7 @@
mCrumbs = (BreadCrumbView) findViewById(R.id.crumbs);
mCrumbs.setUseBackButton(true);
mCrumbs.setController(this);
- mHeaderIcon = getResources().getDrawable(R.drawable.ic_folder_bookmark_widget_holo_dark);
+ mHeaderIcon = getResources().getDrawable(R.drawable.ic_folder_holo_dark);
mCrumbHolder = findViewById(R.id.crumb_holder);
mCrumbs.setMaxVisible(MAX_CRUMBS_SHOWN);
diff --git a/src/com/android/browser/BaseUi.java b/src/com/android/browser/BaseUi.java
index 98fc349..20652cf 100644
--- a/src/com/android/browser/BaseUi.java
+++ b/src/com/android/browser/BaseUi.java
@@ -99,7 +99,7 @@
Resources res = mActivity.getResources();
mInputManager = (InputMethodManager)
browser.getSystemService(Activity.INPUT_METHOD_SERVICE);
- mSecLockIcon = res.getDrawable(R.drawable.ic_secure);
+ mSecLockIcon = res.getDrawable(R.drawable.ic_secure_holo_dark);
mMixLockIcon = res.getDrawable(R.drawable.ic_partial_secure);
FrameLayout frameLayout = (FrameLayout) mActivity.getWindow()
@@ -184,6 +184,7 @@
setUrlTitle(tab);
setFavicon(tab);
updateLockIconToLatest(tab);
+ updateNavigationState(tab);
}
@Override
@@ -518,6 +519,9 @@
// -------------------------------------------------------------------------
+ protected void updateNavigationState(Tab tab) {
+ }
+
/**
* Update the lock icon to correspond to our latest state.
*/
diff --git a/src/com/android/browser/BreadCrumbView.java b/src/com/android/browser/BreadCrumbView.java
index b8409f0..9aaecd7 100644
--- a/src/com/android/browser/BreadCrumbView.java
+++ b/src/com/android/browser/BreadCrumbView.java
@@ -21,6 +21,7 @@
import android.graphics.drawable.Drawable;
import android.text.TextUtils;
import android.util.AttributeSet;
+import android.util.TypedValue;
import android.view.Gravity;
import android.view.View;
import android.view.View.OnClickListener;
@@ -161,8 +162,12 @@
private void addBackButton() {
mBackButton = new ImageButton(mContext);
- mBackButton.setImageResource(R.drawable.ic_back_normal);
- mBackButton.setBackgroundResource(R.drawable.browserbarbutton);
+ mBackButton.setImageResource(R.drawable.ic_back_hierarchy_holo_dark);
+ TypedValue outValue = new TypedValue();
+ getContext().getTheme().resolveAttribute(
+ android.R.attr.selectableItemBackground, outValue, true);
+ int resid = outValue.resourceId;
+ mBackButton.setBackgroundResource(resid);
mBackButton.setLayoutParams(new LayoutParams(LayoutParams.WRAP_CONTENT,
LayoutParams.MATCH_PARENT));
mBackButton.setOnClickListener(this);
diff --git a/src/com/android/browser/BrowserBookmarksAdapter.java b/src/com/android/browser/BrowserBookmarksAdapter.java
index ccd2fbc..9e71077 100644
--- a/src/com/android/browser/BrowserBookmarksAdapter.java
+++ b/src/com/android/browser/BrowserBookmarksAdapter.java
@@ -87,7 +87,7 @@
tv.setText(cursor.getString(BookmarksLoader.COLUMN_INDEX_TITLE));
if (cursor.getInt(BookmarksLoader.COLUMN_INDEX_IS_FOLDER) != 0) {
// folder
- favicon.setImageResource(R.drawable.ic_folder_bookmark_widget_holo_dark);
+ favicon.setImageResource(R.drawable.ic_folder_holo_dark);
favicon.setBackgroundDrawable(null);
} else {
byte[] faviconData = cursor.getBlob(BookmarksLoader.COLUMN_INDEX_FAVICON);
diff --git a/src/com/android/browser/BrowserBookmarksPage.java b/src/com/android/browser/BrowserBookmarksPage.java
index cbaad2b..fa7a5e2 100644
--- a/src/com/android/browser/BrowserBookmarksPage.java
+++ b/src/com/android/browser/BrowserBookmarksPage.java
@@ -382,7 +382,7 @@
if (isFolder) {
item.setUrl(null);
Bitmap bitmap =
- BitmapFactory.decodeResource(getResources(), R.drawable.ic_folder_bookmark_widget_holo_dark);
+ BitmapFactory.decodeResource(getResources(), R.drawable.ic_folder_holo_dark);
item.setFavicon(bitmap);
new LookupBookmarkCount(getActivity(), item)
.execute(cursor.getLong(BookmarksLoader.COLUMN_INDEX_ID));
diff --git a/src/com/android/browser/TabBar.java b/src/com/android/browser/TabBar.java
index b872cad..b0057ed 100644
--- a/src/com/android/browser/TabBar.java
+++ b/src/com/android/browser/TabBar.java
@@ -91,6 +91,7 @@
private BitmapShader mInactiveShader;
private int mTabOverlap;
+ private int mAddTabOverlap;
private int mTabSliceWidth;
private int mTabPadding;
private boolean mUseQuickControls;
@@ -123,6 +124,7 @@
mButtonWidth = -1;
// tab dimensions
mTabOverlap = (int) res.getDimension(R.dimen.tab_overlap);
+ mAddTabOverlap = (int) res.getDimension(R.dimen.tab_addoverlap);
mTabSliceWidth = (int) res.getDimension(R.dimen.tab_slice);
mTabPadding = (int) res.getDimension(R.dimen.tab_padding);
@@ -159,7 +161,7 @@
int w = getMeasuredWidth();
// adjust for new tab overlap
if (!mUseQuickControls) {
- w -= mTabOverlap;
+ w -= mAddTabOverlap;
}
setMeasuredDimension(w, getMeasuredHeight());
}
@@ -174,7 +176,7 @@
if (mUseQuickControls) {
mButtonWidth = 0;
} else {
- mButtonWidth = mNewTab.getMeasuredWidth() - mTabOverlap;
+ mButtonWidth = mNewTab.getMeasuredWidth() - mAddTabOverlap;
if (w-sw < mButtonWidth) {
sw = w - mButtonWidth;
}
@@ -182,8 +184,8 @@
mTabs.layout(pl, pt, pl + sw, bottom - top);
// adjust for overlap
if (!mUseQuickControls) {
- mNewTab.layout(pl + sw - mTabOverlap, pt,
- pl + sw + mButtonWidth - mTabOverlap, bottom - top);
+ mNewTab.layout(pl + sw - mAddTabOverlap, pt,
+ pl + sw + mButtonWidth - mAddTabOverlap, bottom - top);
}
}
diff --git a/src/com/android/browser/TitleBarXLarge.java b/src/com/android/browser/TitleBarXLarge.java
index b5a8032..b5085b8 100644
--- a/src/com/android/browser/TitleBarXLarge.java
+++ b/src/com/android/browser/TitleBarXLarge.java
@@ -36,6 +36,7 @@
import android.view.View.OnClickListener;
import android.view.View.OnFocusChangeListener;
import android.webkit.WebView;
+import android.widget.ImageButton;
import android.widget.ImageView;
import java.util.List;
@@ -56,8 +57,8 @@
private Drawable mReloadDrawable;
private View mContainer;
- private View mBackButton;
- private View mForwardButton;
+ private ImageButton mBackButton;
+ private ImageButton mForwardButton;
private ImageView mStar;
private View mSearchButton;
private View mUrlContainer;
@@ -83,8 +84,8 @@
mUiController = controller;
mUi = ui;
Resources resources = activity.getResources();
- mStopDrawable = resources.getDrawable(R.drawable.ic_stop_normal);
- mReloadDrawable = resources.getDrawable(R.drawable.ic_refresh_normal);
+ mStopDrawable = resources.getDrawable(R.drawable.ic_stop_holo_dark);
+ mReloadDrawable = resources.getDrawable(R.drawable.ic_refresh_holo_dark);
mFocusDrawable = resources.getDrawable(
R.drawable.textfield_active_holo_dark);
mUnfocusDrawable = resources.getDrawable(
@@ -102,8 +103,8 @@
mAllButton = findViewById(R.id.all_btn);
// TODO: Change enabled states based on whether you can go
// back/forward. Probably should be done inside onPageStarted.
- mBackButton = findViewById(R.id.back);
- mForwardButton = findViewById(R.id.forward);
+ mBackButton = (ImageButton) findViewById(R.id.back);
+ mForwardButton = (ImageButton) findViewById(R.id.forward);
mStar = (ImageView) findViewById(R.id.star);
mStopButton = (ImageView) findViewById(R.id.stop);
mSearchButton = findViewById(R.id.search);
@@ -133,6 +134,18 @@
setUrlMode(false);
}
+ void updateNavigationState(Tab tab) {
+ WebView web = tab.getWebView();
+ if (web != null) {
+ mBackButton.setImageResource(web.canGoBack()
+ ? R.drawable.ic_back_holo_dark
+ : R.drawable.ic_back_disabled_holo_dark);
+ mForwardButton.setImageResource(web.canGoForward()
+ ? R.drawable.ic_forward_holo_dark
+ : R.drawable.ic_forward_disabled_holo_dark);
+ }
+ }
+
public void setEditable(boolean editable) {
mEditable = editable;
mUrlInput.setFocusable(mEditable);
diff --git a/src/com/android/browser/XLargeUi.java b/src/com/android/browser/XLargeUi.java
index d50d94e..a9cc9fe 100644
--- a/src/com/android/browser/XLargeUi.java
+++ b/src/com/android/browser/XLargeUi.java
@@ -342,6 +342,12 @@
}
@Override
+ protected void updateNavigationState(Tab tab) {
+ mTitleBar.updateNavigationState(tab);
+ mFakeTitleBar.updateNavigationState(tab);
+ }
+
+ @Override
public void setUrlTitle(Tab tab) {
super.setUrlTitle(tab);
mTabBar.onUrlAndTitle(tab, tab.getUrl(), tab.getTitle());
diff --git a/src/com/android/browser/addbookmark/FolderSpinnerAdapter.java b/src/com/android/browser/addbookmark/FolderSpinnerAdapter.java
index 0144300..0712469 100644
--- a/src/com/android/browser/addbookmark/FolderSpinnerAdapter.java
+++ b/src/com/android/browser/addbookmark/FolderSpinnerAdapter.java
@@ -54,15 +54,15 @@
switch (position) {
case HOME_SCREEN:
labelResource = R.string.add_to_homescreen_menu_option;
- drawableResource = R.drawable.ic_home;
+ drawableResource = R.drawable.ic_home_holo_dark;
break;
case ROOT_FOLDER:
labelResource = R.string.add_to_bookmarks_menu_option;
- drawableResource = R.drawable.ic_menu_bookmarks;
+ drawableResource = R.drawable.ic_bookmarks_holo_dark;
break;
case OTHER_FOLDER:
labelResource = R.string.add_to_other_folder_menu_option;
- drawableResource = R.drawable.ic_folder_bookmark_widget_holo_dark;
+ drawableResource = R.drawable.ic_folder_holo_dark;
break;
default:
labelResource = 0;
diff --git a/src/com/android/browser/preferences/WebsiteSettingsFragment.java b/src/com/android/browser/preferences/WebsiteSettingsFragment.java
index 1965ffe..6339d72 100644
--- a/src/com/android/browser/preferences/WebsiteSettingsFragment.java
+++ b/src/com/android/browser/preferences/WebsiteSettingsFragment.java
@@ -191,9 +191,9 @@
mUsageHighIcon = BitmapFactory.decodeResource(getResources(),
R.drawable.ic_list_data_large);
mLocationAllowedIcon = BitmapFactory.decodeResource(getResources(),
- R.drawable.ic_list_gps_on);
+ R.drawable.ic_gps_on_holo_dark);
mLocationDisallowedIcon = BitmapFactory.decodeResource(getResources(),
- R.drawable.ic_list_gps_denied);
+ R.drawable.ic_gps_denied_holo_dark);
mCurrentSite = site;
if (mCurrentSite == null) {
askForOrigins();
diff --git a/src/com/android/browser/provider/BrowserProvider2.java b/src/com/android/browser/provider/BrowserProvider2.java
index ff00c56..a51635c 100644
--- a/src/com/android/browser/provider/BrowserProvider2.java
+++ b/src/com/android/browser/provider/BrowserProvider2.java
@@ -1564,7 +1564,7 @@
case SUGGEST_COLUMN_TEXT_1_ID:
return mSource.getString(TITLE_INDEX);
case SUGGEST_COLUMN_ICON_1_ID:
- return Integer.toString(R.drawable.ic_favorite_off_normal);
+ return Integer.toString(R.drawable.ic_bookmark_off_holo_dark);
}
return null;
}
