Clean visual style, part II: extend bright style, convert icons, more touch-ups.
This commit removes the remaining white icons from the previous style,
which was a mix of 'holo dark' (i.e. light) icons and other un-fitting
icons. It's all replaced with theme-colored icons.
The primary color itself had been altered a bit towards green (#18aba1).
Other than the icon replacements, this commit changes:
- tab switcher: fix cosmetic bug in the title bar in <= xhdpi devices
- tab switcher: better incognito presentation
- settings: enable back (<-) arrow
- settings: bold color in the activity (on L and up)
- settings: rationalized launching
- better spacings on the mobile title bar
- better padding on history items
- add proportional padding (1em) to the incognito page
- the incognito tab bar gets a bit darker
- ['Ingnito Page', 'New Incognito Tab'] -> 'Private Browsing'
- 'Page info' -> 'Page information' (no abbrevs when user facing :)
Vast amount of unused resources are removed from the APK.
Change-Id: I4add15fc686495ce27f63e26c2c56c14fa3d6603
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 6b9e1b7..e8e520b 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -183,7 +183,9 @@
</intent-filter>
</activity>
- <activity android:name="BrowserPreferencesPage" android:label="@string/menu_preferences">
+ <activity android:name="BrowserPreferencesPage" android:label="@string/menu_preferences"
+ android:parentActivityName=".BrowserActivity"
+ android:theme="@style/SettingsTheme">
<intent-filter>
<action android:name="android.intent.action.MANAGE_NETWORK_USAGE" />
<category android:name="android.intent.category.DEFAULT" />
diff --git a/res/drawable-hdpi/app_web_browser_sm.png b/res/drawable-hdpi/app_web_browser_sm.png
deleted file mode 100644
index 62d5cc3..0000000
--- a/res/drawable-hdpi/app_web_browser_sm.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_add_string.png b/res/drawable-hdpi/ic_add_string.png
deleted file mode 100644
index 34d1324..0000000
--- a/res/drawable-hdpi/ic_add_string.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_bookmark_off_holo_dark.png b/res/drawable-hdpi/ic_bookmark_off_holo_dark.png
deleted file mode 100644
index f827be5..0000000
--- a/res/drawable-hdpi/ic_bookmark_off_holo_dark.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_bookmark_on_holo_dark.png b/res/drawable-hdpi/ic_bookmark_on_holo_dark.png
deleted file mode 100644
index 2aad5cc..0000000
--- a/res/drawable-hdpi/ic_bookmark_on_holo_dark.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_bookmark_widget_bookmark_holo_dark.png b/res/drawable-hdpi/ic_bookmark_widget_bookmark_holo_dark.png
deleted file mode 100644
index 4e0d125..0000000
--- a/res/drawable-hdpi/ic_bookmark_widget_bookmark_holo_dark.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
deleted file mode 100644
index afd5c16..0000000
--- a/res/drawable-hdpi/ic_bookmarks_history_holo_dark.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_bookmarks_holo_dark.png b/res/drawable-hdpi/ic_bookmarks_holo_dark.png
deleted file mode 100644
index c313cce..0000000
--- a/res/drawable-hdpi/ic_bookmarks_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
deleted file mode 100644
index 139d79b..0000000
--- a/res/drawable-hdpi/ic_folder_holo_dark.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_history_holo_dark.png b/res/drawable-hdpi/ic_history_holo_dark.png
deleted file mode 100644
index 4f2ee7d..0000000
--- a/res/drawable-hdpi/ic_history_holo_dark.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
deleted file mode 100644
index f355507..0000000
--- a/res/drawable-hdpi/ic_home_holo_dark.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_home_info_holo_dark.png b/res/drawable-hdpi/ic_home_info_holo_dark.png
deleted file mode 100644
index 5a0d151..0000000
--- a/res/drawable-hdpi/ic_home_info_holo_dark.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_incognito_holo_dark.png b/res/drawable-hdpi/ic_incognito_holo_dark.png
deleted file mode 100644
index 3e44913..0000000
--- a/res/drawable-hdpi/ic_incognito_holo_dark.png
+++ /dev/null
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
deleted file mode 100644
index 70cc97d..0000000
--- a/res/drawable-hdpi/ic_new_window_holo_dark.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_querybuilder_disabled.png b/res/drawable-hdpi/ic_querybuilder_disabled.png
deleted file mode 100644
index 907a248..0000000
--- a/res/drawable-hdpi/ic_querybuilder_disabled.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_querybuilder_normal.png b/res/drawable-hdpi/ic_querybuilder_normal.png
deleted file mode 100644
index 195329d..0000000
--- a/res/drawable-hdpi/ic_querybuilder_normal.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_querybuilder_pressed.png b/res/drawable-hdpi/ic_querybuilder_pressed.png
deleted file mode 100644
index 1ad9e05..0000000
--- a/res/drawable-hdpi/ic_querybuilder_pressed.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_settings_holo_dark.png b/res/drawable-hdpi/ic_settings_holo_dark.png
deleted file mode 100644
index ac3f40c..0000000
--- a/res/drawable-hdpi/ic_settings_holo_dark.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_tab_close.png b/res/drawable-hdpi/ic_tab_close.png
deleted file mode 100644
index 199af9a..0000000
--- a/res/drawable-hdpi/ic_tab_close.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
deleted file mode 100644
index e79aa71..0000000
--- a/res/drawable-hdpi/ic_voice_search_holo_dark.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_web_holo_dark.png b/res/drawable-hdpi/ic_web_holo_dark.png
deleted file mode 100644
index fe881c2..0000000
--- a/res/drawable-hdpi/ic_web_holo_dark.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/trashcan.png b/res/drawable-hdpi/trashcan.png
deleted file mode 100644
index c203fe4..0000000
--- a/res/drawable-hdpi/trashcan.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/app_web_browser_sm.png b/res/drawable-mdpi/app_web_browser_sm.png
deleted file mode 100644
index 0bbc682..0000000
--- a/res/drawable-mdpi/app_web_browser_sm.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_add_string.png b/res/drawable-mdpi/ic_add_string.png
deleted file mode 100644
index 621dee0..0000000
--- a/res/drawable-mdpi/ic_add_string.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_bookmark_off_holo_dark.png b/res/drawable-mdpi/ic_bookmark_off_holo_dark.png
deleted file mode 100644
index 825970c..0000000
--- a/res/drawable-mdpi/ic_bookmark_off_holo_dark.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_bookmark_on_holo_dark.png b/res/drawable-mdpi/ic_bookmark_on_holo_dark.png
deleted file mode 100644
index 82da4ea..0000000
--- a/res/drawable-mdpi/ic_bookmark_on_holo_dark.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_bookmark_widget_bookmark_holo_dark.png b/res/drawable-mdpi/ic_bookmark_widget_bookmark_holo_dark.png
deleted file mode 100644
index 0efb4c6..0000000
--- a/res/drawable-mdpi/ic_bookmark_widget_bookmark_holo_dark.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
deleted file mode 100644
index f4953e5..0000000
--- a/res/drawable-mdpi/ic_bookmarks_history_holo_dark.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_bookmarks_holo_dark.png b/res/drawable-mdpi/ic_bookmarks_holo_dark.png
deleted file mode 100644
index d9b305f..0000000
--- a/res/drawable-mdpi/ic_bookmarks_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
deleted file mode 100644
index a9bebb9..0000000
--- a/res/drawable-mdpi/ic_folder_holo_dark.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_history_holo_dark.png b/res/drawable-mdpi/ic_history_holo_dark.png
deleted file mode 100644
index 0e4e118..0000000
--- a/res/drawable-mdpi/ic_history_holo_dark.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
deleted file mode 100644
index 8884eaa..0000000
--- a/res/drawable-mdpi/ic_home_holo_dark.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_home_info_holo_dark.png b/res/drawable-mdpi/ic_home_info_holo_dark.png
deleted file mode 100644
index 964b8c8..0000000
--- a/res/drawable-mdpi/ic_home_info_holo_dark.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_incognito_holo_dark.png b/res/drawable-mdpi/ic_incognito_holo_dark.png
deleted file mode 100644
index 197599c..0000000
--- a/res/drawable-mdpi/ic_incognito_holo_dark.png
+++ /dev/null
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
deleted file mode 100644
index 026afd0..0000000
--- a/res/drawable-mdpi/ic_new_window_holo_dark.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_querybuilder_disabled.png b/res/drawable-mdpi/ic_querybuilder_disabled.png
deleted file mode 100644
index 58956b6..0000000
--- a/res/drawable-mdpi/ic_querybuilder_disabled.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_querybuilder_normal.png b/res/drawable-mdpi/ic_querybuilder_normal.png
deleted file mode 100644
index 0d2858b..0000000
--- a/res/drawable-mdpi/ic_querybuilder_normal.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_querybuilder_pressed.png b/res/drawable-mdpi/ic_querybuilder_pressed.png
deleted file mode 100644
index 0d2858b..0000000
--- a/res/drawable-mdpi/ic_querybuilder_pressed.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_settings_holo_dark.png b/res/drawable-mdpi/ic_settings_holo_dark.png
deleted file mode 100644
index 2ab07c4..0000000
--- a/res/drawable-mdpi/ic_settings_holo_dark.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_tab_close.png b/res/drawable-mdpi/ic_tab_close.png
deleted file mode 100644
index 33f5c43..0000000
--- a/res/drawable-mdpi/ic_tab_close.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_voice_search_holo_dark.png b/res/drawable-mdpi/ic_voice_search_holo_dark.png
deleted file mode 100644
index f809e52..0000000
--- a/res/drawable-mdpi/ic_voice_search_holo_dark.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_web_holo_dark.png b/res/drawable-mdpi/ic_web_holo_dark.png
deleted file mode 100644
index 7cab120..0000000
--- a/res/drawable-mdpi/ic_web_holo_dark.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/trashcan.png b/res/drawable-mdpi/trashcan.png
deleted file mode 100644
index 053ba67..0000000
--- a/res/drawable-mdpi/trashcan.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/app_web_browser_sm.png b/res/drawable-xhdpi/app_web_browser_sm.png
deleted file mode 100644
index 45a5f12..0000000
--- a/res/drawable-xhdpi/app_web_browser_sm.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_add_string.png b/res/drawable-xhdpi/ic_add_string.png
deleted file mode 100644
index 7ea150d..0000000
--- a/res/drawable-xhdpi/ic_add_string.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_bookmark_off_holo_dark.png b/res/drawable-xhdpi/ic_bookmark_off_holo_dark.png
deleted file mode 100644
index c60aad8..0000000
--- a/res/drawable-xhdpi/ic_bookmark_off_holo_dark.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_bookmark_on_holo_dark.png b/res/drawable-xhdpi/ic_bookmark_on_holo_dark.png
deleted file mode 100644
index 5219525..0000000
--- a/res/drawable-xhdpi/ic_bookmark_on_holo_dark.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_bookmark_widget_bookmark_holo_dark.png b/res/drawable-xhdpi/ic_bookmark_widget_bookmark_holo_dark.png
deleted file mode 100644
index 8025248..0000000
--- a/res/drawable-xhdpi/ic_bookmark_widget_bookmark_holo_dark.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
deleted file mode 100644
index 71fdd09..0000000
--- a/res/drawable-xhdpi/ic_bookmarks_history_holo_dark.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_bookmarks_holo_dark.png b/res/drawable-xhdpi/ic_bookmarks_holo_dark.png
deleted file mode 100644
index 00ae343..0000000
--- a/res/drawable-xhdpi/ic_bookmarks_holo_dark.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_folder_holo_dark.png b/res/drawable-xhdpi/ic_folder_holo_dark.png
deleted file mode 100644
index 6bdb7d0..0000000
--- a/res/drawable-xhdpi/ic_folder_holo_dark.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_history_holo_dark.png b/res/drawable-xhdpi/ic_history_holo_dark.png
deleted file mode 100644
index c916bde..0000000
--- a/res/drawable-xhdpi/ic_history_holo_dark.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_home_holo_dark.png b/res/drawable-xhdpi/ic_home_holo_dark.png
deleted file mode 100644
index 177abe9..0000000
--- a/res/drawable-xhdpi/ic_home_holo_dark.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_home_info_holo_dark.png b/res/drawable-xhdpi/ic_home_info_holo_dark.png
deleted file mode 100644
index 6f43ba5..0000000
--- a/res/drawable-xhdpi/ic_home_info_holo_dark.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_incognito_holo_dark.png b/res/drawable-xhdpi/ic_incognito_holo_dark.png
deleted file mode 100644
index 94bf80e..0000000
--- a/res/drawable-xhdpi/ic_incognito_holo_dark.png
+++ /dev/null
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
deleted file mode 100644
index 69420f7..0000000
--- a/res/drawable-xhdpi/ic_new_window_holo_dark.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_querybuilder_disabled.png b/res/drawable-xhdpi/ic_querybuilder_disabled.png
deleted file mode 100644
index 79fb478..0000000
--- a/res/drawable-xhdpi/ic_querybuilder_disabled.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_querybuilder_normal.png b/res/drawable-xhdpi/ic_querybuilder_normal.png
deleted file mode 100644
index 1a4680c..0000000
--- a/res/drawable-xhdpi/ic_querybuilder_normal.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_querybuilder_pressed.png b/res/drawable-xhdpi/ic_querybuilder_pressed.png
deleted file mode 100644
index af9e7a1..0000000
--- a/res/drawable-xhdpi/ic_querybuilder_pressed.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_settings_holo_dark.png b/res/drawable-xhdpi/ic_settings_holo_dark.png
deleted file mode 100644
index 0541407..0000000
--- a/res/drawable-xhdpi/ic_settings_holo_dark.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_tab_close.png b/res/drawable-xhdpi/ic_tab_close.png
deleted file mode 100644
index 65f09dd..0000000
--- a/res/drawable-xhdpi/ic_tab_close.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_voice_search_holo_dark.png b/res/drawable-xhdpi/ic_voice_search_holo_dark.png
deleted file mode 100644
index 02876b7..0000000
--- a/res/drawable-xhdpi/ic_voice_search_holo_dark.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_web_holo_dark.png b/res/drawable-xhdpi/ic_web_holo_dark.png
deleted file mode 100644
index 4395e8e..0000000
--- a/res/drawable-xhdpi/ic_web_holo_dark.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/nav_tab_title_incognito.9.png b/res/drawable-xhdpi/nav_tab_title_incognito.9.png
new file mode 100644
index 0000000..37e8f48
--- /dev/null
+++ b/res/drawable-xhdpi/nav_tab_title_incognito.9.png
Binary files differ
diff --git a/res/drawable-xhdpi/nav_tab_title_normal.9.png b/res/drawable-xhdpi/nav_tab_title_normal.9.png
new file mode 100644
index 0000000..4013b06
--- /dev/null
+++ b/res/drawable-xhdpi/nav_tab_title_normal.9.png
Binary files differ
diff --git a/res/drawable-xhdpi/trashcan.png b/res/drawable-xhdpi/trashcan.png
deleted file mode 100644
index 8b9982c..0000000
--- a/res/drawable-xhdpi/trashcan.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_action_add_incognito_active.png b/res/drawable-xxhdpi/ic_action_add_incognito_active.png
index fc2316c..a74a483 100644
--- a/res/drawable-xxhdpi/ic_action_add_incognito_active.png
+++ b/res/drawable-xxhdpi/ic_action_add_incognito_active.png
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_action_add_incognito_disabled.png b/res/drawable-xxhdpi/ic_action_add_incognito_disabled.png
index 3931985..f1f0a0d 100644
--- a/res/drawable-xxhdpi/ic_action_add_incognito_disabled.png
+++ b/res/drawable-xxhdpi/ic_action_add_incognito_disabled.png
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_action_add_incognito_normal.png b/res/drawable-xxhdpi/ic_action_add_incognito_normal.png
index 783f11b..6a89600 100644
--- a/res/drawable-xxhdpi/ic_action_add_incognito_normal.png
+++ b/res/drawable-xxhdpi/ic_action_add_incognito_normal.png
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_action_add_tab_active.png b/res/drawable-xxhdpi/ic_action_add_tab_active.png
index d7e01fa..3b4dde5 100644
--- a/res/drawable-xxhdpi/ic_action_add_tab_active.png
+++ b/res/drawable-xxhdpi/ic_action_add_tab_active.png
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_action_add_tab_disabled.png b/res/drawable-xxhdpi/ic_action_add_tab_disabled.png
index a31420b..8d309a8 100644
--- a/res/drawable-xxhdpi/ic_action_add_tab_disabled.png
+++ b/res/drawable-xxhdpi/ic_action_add_tab_disabled.png
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_action_add_tab_normal.png b/res/drawable-xxhdpi/ic_action_add_tab_normal.png
index 468a691..e10a14a 100644
--- a/res/drawable-xxhdpi/ic_action_add_tab_normal.png
+++ b/res/drawable-xxhdpi/ic_action_add_tab_normal.png
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_action_bookmark_active.png b/res/drawable-xxhdpi/ic_action_bookmark_active.png
index 74711e1..ac9d99c 100644
--- a/res/drawable-xxhdpi/ic_action_bookmark_active.png
+++ b/res/drawable-xxhdpi/ic_action_bookmark_active.png
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_action_bookmark_checked.png b/res/drawable-xxhdpi/ic_action_bookmark_checked.png
index 808fa5a..0b2472d 100644
--- a/res/drawable-xxhdpi/ic_action_bookmark_checked.png
+++ b/res/drawable-xxhdpi/ic_action_bookmark_checked.png
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_action_bookmark_disabled.png b/res/drawable-xxhdpi/ic_action_bookmark_disabled.png
index 5f7f033..9f1ad0c 100644
--- a/res/drawable-xxhdpi/ic_action_bookmark_disabled.png
+++ b/res/drawable-xxhdpi/ic_action_bookmark_disabled.png
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_action_bookmark_normal.png b/res/drawable-xxhdpi/ic_action_bookmark_normal.png
index cfbdb6c..3fca267 100644
--- a/res/drawable-xxhdpi/ic_action_bookmark_normal.png
+++ b/res/drawable-xxhdpi/ic_action_bookmark_normal.png
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_action_gps_off.png b/res/drawable-xxhdpi/ic_action_gps_off.png
index ea88d56..f537312 100644
--- a/res/drawable-xxhdpi/ic_action_gps_off.png
+++ b/res/drawable-xxhdpi/ic_action_gps_off.png
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_action_gps_on.png b/res/drawable-xxhdpi/ic_action_gps_on.png
index 1c2d93c..f382e99 100644
--- a/res/drawable-xxhdpi/ic_action_gps_on.png
+++ b/res/drawable-xxhdpi/ic_action_gps_on.png
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_action_history_backward_active.png b/res/drawable-xxhdpi/ic_action_history_backward_active.png
index 4baf3c4..09ea85d 100644
--- a/res/drawable-xxhdpi/ic_action_history_backward_active.png
+++ b/res/drawable-xxhdpi/ic_action_history_backward_active.png
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_action_history_backward_disabled.png b/res/drawable-xxhdpi/ic_action_history_backward_disabled.png
index 657d98f..74f50d0 100644
--- a/res/drawable-xxhdpi/ic_action_history_backward_disabled.png
+++ b/res/drawable-xxhdpi/ic_action_history_backward_disabled.png
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_action_history_backward_normal.png b/res/drawable-xxhdpi/ic_action_history_backward_normal.png
index aa213e4..abbe8f3 100644
--- a/res/drawable-xxhdpi/ic_action_history_backward_normal.png
+++ b/res/drawable-xxhdpi/ic_action_history_backward_normal.png
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_action_history_forward_active.png b/res/drawable-xxhdpi/ic_action_history_forward_active.png
index 78e5ada..1d035f5 100644
--- a/res/drawable-xxhdpi/ic_action_history_forward_active.png
+++ b/res/drawable-xxhdpi/ic_action_history_forward_active.png
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_action_history_forward_disabled.png b/res/drawable-xxhdpi/ic_action_history_forward_disabled.png
index ea58281..bd14079 100644
--- a/res/drawable-xxhdpi/ic_action_history_forward_disabled.png
+++ b/res/drawable-xxhdpi/ic_action_history_forward_disabled.png
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_action_history_forward_normal.png b/res/drawable-xxhdpi/ic_action_history_forward_normal.png
index cda9c34..aaff700 100644
--- a/res/drawable-xxhdpi/ic_action_history_forward_normal.png
+++ b/res/drawable-xxhdpi/ic_action_history_forward_normal.png
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_action_microphone_normal.png b/res/drawable-xxhdpi/ic_action_microphone_normal.png
new file mode 100644
index 0000000..7d8f56b
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_action_microphone_normal.png
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_action_overflow_active.png b/res/drawable-xxhdpi/ic_action_overflow_active.png
index 6de9030..d15f818 100644
--- a/res/drawable-xxhdpi/ic_action_overflow_active.png
+++ b/res/drawable-xxhdpi/ic_action_overflow_active.png
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_action_overflow_disabled.png b/res/drawable-xxhdpi/ic_action_overflow_disabled.png
index b400f31..bf58294 100644
--- a/res/drawable-xxhdpi/ic_action_overflow_disabled.png
+++ b/res/drawable-xxhdpi/ic_action_overflow_disabled.png
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_action_overflow_normal.png b/res/drawable-xxhdpi/ic_action_overflow_normal.png
index 3fcf285..9f5666f 100644
--- a/res/drawable-xxhdpi/ic_action_overflow_normal.png
+++ b/res/drawable-xxhdpi/ic_action_overflow_normal.png
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_action_querybuilder_active.png b/res/drawable-xxhdpi/ic_action_querybuilder_active.png
new file mode 100644
index 0000000..bb9cc88
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_action_querybuilder_active.png
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_action_querybuilder_disabled.png b/res/drawable-xxhdpi/ic_action_querybuilder_disabled.png
new file mode 100644
index 0000000..e03de17
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_action_querybuilder_disabled.png
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_action_querybuilder_normal.png b/res/drawable-xxhdpi/ic_action_querybuilder_normal.png
new file mode 100644
index 0000000..275738c
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_action_querybuilder_normal.png
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_action_reload_active.png b/res/drawable-xxhdpi/ic_action_reload_active.png
index ec63dda..6151ef4 100644
--- a/res/drawable-xxhdpi/ic_action_reload_active.png
+++ b/res/drawable-xxhdpi/ic_action_reload_active.png
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_action_reload_disabled.png b/res/drawable-xxhdpi/ic_action_reload_disabled.png
index b4a554d..7d22fd6 100644
--- a/res/drawable-xxhdpi/ic_action_reload_disabled.png
+++ b/res/drawable-xxhdpi/ic_action_reload_disabled.png
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_action_reload_normal.png b/res/drawable-xxhdpi/ic_action_reload_normal.png
index a017453..6abc029 100644
--- a/res/drawable-xxhdpi/ic_action_reload_normal.png
+++ b/res/drawable-xxhdpi/ic_action_reload_normal.png
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_action_share_active.png b/res/drawable-xxhdpi/ic_action_share_active.png
index b7cfdb0..96e8695 100644
--- a/res/drawable-xxhdpi/ic_action_share_active.png
+++ b/res/drawable-xxhdpi/ic_action_share_active.png
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_action_share_disabled.png b/res/drawable-xxhdpi/ic_action_share_disabled.png
index edba395..8bdb874 100644
--- a/res/drawable-xxhdpi/ic_action_share_disabled.png
+++ b/res/drawable-xxhdpi/ic_action_share_disabled.png
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_action_share_normal.png b/res/drawable-xxhdpi/ic_action_share_normal.png
index 2ed118a..e107e02 100644
--- a/res/drawable-xxhdpi/ic_action_share_normal.png
+++ b/res/drawable-xxhdpi/ic_action_share_normal.png
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_action_stop_active.png b/res/drawable-xxhdpi/ic_action_stop_active.png
index ad0db49..7aae12c 100644
--- a/res/drawable-xxhdpi/ic_action_stop_active.png
+++ b/res/drawable-xxhdpi/ic_action_stop_active.png
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_action_stop_disabled.png b/res/drawable-xxhdpi/ic_action_stop_disabled.png
index a525fbd..324de61 100644
--- a/res/drawable-xxhdpi/ic_action_stop_disabled.png
+++ b/res/drawable-xxhdpi/ic_action_stop_disabled.png
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_action_stop_normal.png b/res/drawable-xxhdpi/ic_action_stop_normal.png
index 7459192..9bc8337 100644
--- a/res/drawable-xxhdpi/ic_action_stop_normal.png
+++ b/res/drawable-xxhdpi/ic_action_stop_normal.png
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_action_stop_normal_inverted.png b/res/drawable-xxhdpi/ic_action_stop_normal_inverted.png
new file mode 100644
index 0000000..d1c2952
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_action_stop_normal_inverted.png
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_action_tabswitcher_active.png b/res/drawable-xxhdpi/ic_action_tabswitcher_active.png
index d594918..07202d6 100644
--- a/res/drawable-xxhdpi/ic_action_tabswitcher_active.png
+++ b/res/drawable-xxhdpi/ic_action_tabswitcher_active.png
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_action_tabswitcher_disabled.png b/res/drawable-xxhdpi/ic_action_tabswitcher_disabled.png
index e1f611b..eb3444d 100644
--- a/res/drawable-xxhdpi/ic_action_tabswitcher_disabled.png
+++ b/res/drawable-xxhdpi/ic_action_tabswitcher_disabled.png
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_action_tabswitcher_normal.png b/res/drawable-xxhdpi/ic_action_tabswitcher_normal.png
index a2e3aaa..e726088 100644
--- a/res/drawable-xxhdpi/ic_action_tabswitcher_normal.png
+++ b/res/drawable-xxhdpi/ic_action_tabswitcher_normal.png
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_action_trash_normal.png b/res/drawable-xxhdpi/ic_action_trash_normal.png
new file mode 100644
index 0000000..a06804b
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_action_trash_normal.png
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_deco_bookmarks_normal.png b/res/drawable-xxhdpi/ic_deco_bookmarks_normal.png
new file mode 100644
index 0000000..291e9d3
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_deco_bookmarks_normal.png
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_deco_favicon_normal.png b/res/drawable-xxhdpi/ic_deco_favicon_normal.png
new file mode 100644
index 0000000..5e38c97
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_deco_favicon_normal.png
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_deco_folder_normal.png b/res/drawable-xxhdpi/ic_deco_folder_normal.png
new file mode 100644
index 0000000..3a62915
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_deco_folder_normal.png
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_deco_home_normal.png b/res/drawable-xxhdpi/ic_deco_home_normal.png
new file mode 100644
index 0000000..9147703
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_deco_home_normal.png
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_deco_incognito_normal.png b/res/drawable-xxhdpi/ic_deco_incognito_normal.png
new file mode 100644
index 0000000..fca66c4
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_deco_incognito_normal.png
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_deco_info_normal.png b/res/drawable-xxhdpi/ic_deco_info_normal.png
new file mode 100644
index 0000000..470e5b2
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_deco_info_normal.png
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_suggest_browser_normal.png b/res/drawable-xxhdpi/ic_suggest_browser_normal.png
index b433694..1dcc8da 100644
--- a/res/drawable-xxhdpi/ic_suggest_browser_normal.png
+++ b/res/drawable-xxhdpi/ic_suggest_browser_normal.png
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_suggest_history_normal.png b/res/drawable-xxhdpi/ic_suggest_history_normal.png
index fda1241..ea86b8d 100644
--- a/res/drawable-xxhdpi/ic_suggest_history_normal.png
+++ b/res/drawable-xxhdpi/ic_suggest_history_normal.png
Binary files differ
diff --git a/res/drawable-xxhdpi/nav_tab_title.9.png b/res/drawable-xxhdpi/nav_tab_title.9.png
deleted file mode 100644
index 744d6d4..0000000
--- a/res/drawable-xxhdpi/nav_tab_title.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable/btn_checkbox_star.xml b/res/drawable/btn_checkbox_star.xml
deleted file mode 100644
index 08a8699..0000000
--- a/res/drawable/btn_checkbox_star.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2008 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_checked="true"
- android:drawable="@drawable/ic_bookmark_on_holo_dark" />
- <item android:state_checked="false"
- 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
deleted file mode 100644
index c1bfb5d..0000000
--- a/res/drawable/btn_imageview_star.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2008 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/ic_bookmark_on_holo_dark" />
- <item android:state_activated="false"
- android:drawable="@drawable/ic_bookmark_off_holo_dark" />
-</selector>
diff --git a/res/drawable/ic_action_close.xml b/res/drawable/ic_action_close.xml
new file mode 100644
index 0000000..bda0783
--- /dev/null
+++ b/res/drawable/ic_action_close.xml
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright (c) 2014, The Linux Foundation. All rights reserved.
+
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions are
+ met:
+ * Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+ * Redistributions in binary form must reproduce the above
+ copyright notice, this list of conditions and the following
+ disclaimer in the documentation and/or other materials provided
+ with the distribution.
+ * Neither the name of The Linux Foundation nor the names of its
+ contributors may be used to endorse or promote products derived
+ from this software without specific prior written permission.
+
+ THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED
+ WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT
+ ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS
+ BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
+ BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
+ OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
+ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+-->
+
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+
+ <item android:state_enabled="true" android:state_pressed="true"
+ android:drawable="@drawable/ic_action_stop_active" />
+
+ <item android:state_enabled="true" android:state_selected="true"
+ android:drawable="@drawable/ic_action_stop_active" />
+
+ <item android:state_enabled="false"
+ android:drawable="@drawable/ic_action_stop_disabled" />
+
+ <item android:drawable="@drawable/ic_action_stop_normal" />
+
+</selector>
diff --git a/res/drawable/ic_action_close_inverted.xml b/res/drawable/ic_action_close_inverted.xml
new file mode 100644
index 0000000..da99880
--- /dev/null
+++ b/res/drawable/ic_action_close_inverted.xml
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright (c) 2014, The Linux Foundation. All rights reserved.
+
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions are
+ met:
+ * Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+ * Redistributions in binary form must reproduce the above
+ copyright notice, this list of conditions and the following
+ disclaimer in the documentation and/or other materials provided
+ with the distribution.
+ * Neither the name of The Linux Foundation nor the names of its
+ contributors may be used to endorse or promote products derived
+ from this software without specific prior written permission.
+
+ THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED
+ WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT
+ ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS
+ BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
+ BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
+ OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
+ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+-->
+
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+
+ <item android:state_enabled="true" android:state_pressed="true"
+ android:drawable="@drawable/ic_action_stop_active" />
+
+ <item android:state_enabled="true" android:state_selected="true"
+ android:drawable="@drawable/ic_action_stop_active" />
+
+ <item android:state_enabled="false"
+ android:drawable="@drawable/ic_action_stop_disabled" />
+
+ <item android:drawable="@drawable/ic_action_stop_normal_inverted" />
+
+</selector>
diff --git a/res/drawable/ic_querybuilder.xml b/res/drawable/ic_action_querybuilder.xml
similarity index 75%
rename from res/drawable/ic_querybuilder.xml
rename to res/drawable/ic_action_querybuilder.xml
index 9522945..8a81e22 100644
--- a/res/drawable/ic_querybuilder.xml
+++ b/res/drawable/ic_action_querybuilder.xml
@@ -17,18 +17,18 @@
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_enabled="false"
- android:drawable="@drawable/ic_querybuilder_disabled" />
+ android:drawable="@drawable/ic_action_querybuilder_disabled" />
<item android:state_enabled="true" android:state_pressed="true"
- android:drawable="@drawable/ic_querybuilder_pressed" />
+ android:drawable="@drawable/ic_action_querybuilder_active" />
<item android:state_enabled="true" android:state_focused="true"
android:state_window_focused="true"
- android:drawable="@drawable/ic_querybuilder_pressed" />
+ android:drawable="@drawable/ic_action_querybuilder_active" />
<item android:state_enabled="true" android:state_selected="true"
- android:drawable="@drawable/ic_querybuilder_pressed" />
+ android:drawable="@drawable/ic_action_querybuilder_active" />
<item android:state_enabled="true"
- android:drawable="@drawable/ic_querybuilder_normal" />
+ android:drawable="@drawable/ic_action_querybuilder_normal" />
</selector>
diff --git a/res/layout-sw600dp/title_bar_nav.xml b/res/layout-sw600dp/title_bar_nav.xml
index 3ec3192..6cc6d0d 100644
--- a/res/layout-sw600dp/title_bar_nav.xml
+++ b/res/layout-sw600dp/title_bar_nav.xml
@@ -67,7 +67,7 @@
android:layout_width="32dip"
android:layout_height="20dip"
android:layout_gravity="center"
- android:src="@drawable/ic_web_holo_dark" />
+ android:src="@drawable/ic_deco_favicon_normal" />
<ImageView
android:id="@+id/lock"
@@ -115,7 +115,7 @@
style="@style/NavButton"
android:layout_width="wrap_content"
android:contentDescription="@string/accessibility_button_voice"
- android:src="@drawable/ic_voice_search_holo_dark" />
+ android:src="@drawable/ic_action_microphone_normal" />
</LinearLayout>
<ImageButton
@@ -132,7 +132,7 @@
android:layout_width="wrap_content"
android:contentDescription="@string/accessibility_button_bookmarks"
android:scaleType="center"
- android:src="@drawable/ic_bookmarks_history_holo_dark" />
+ android:src="@drawable/ic_deco_bookmarks_normal" />
<ImageButton
android:id="@+id/more_browser_settings"
diff --git a/res/layout-sw600dp/title_bar_snapshot.xml b/res/layout-sw600dp/title_bar_snapshot.xml
index f2abd5c..9c4796d 100644
--- a/res/layout-sw600dp/title_bar_snapshot.xml
+++ b/res/layout-sw600dp/title_bar_snapshot.xml
@@ -50,5 +50,5 @@
android:contentDescription="@string/accessibility_button_bookmarks"
android:paddingRight="16dip"
android:scaleType="center"
- android:src="@drawable/ic_bookmarks_history_holo_dark" />
+ android:src="@drawable/ic_deco_bookmarks_normal" />
</com.android.browser.SnapshotBar>
\ No newline at end of file
diff --git a/res/layout/add_new_bookmark.xml b/res/layout/add_new_bookmark.xml
index 53f7554..28c9c60 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_bookmark_on_holo_dark"
+ android:src="@drawable/ic_action_bookmark_checked"
android:scaleType="fitCenter"
/>
<LinearLayout
diff --git a/res/layout/bookmarks_drag_actionmode.xml b/res/layout/bookmarks_drag_actionmode.xml
index 64b1042..df64fb9 100644
--- a/res/layout/bookmarks_drag_actionmode.xml
+++ b/res/layout/bookmarks_drag_actionmode.xml
@@ -30,19 +30,19 @@
android:layout_height="match_parent"
android:paddingLeft="16dip"
android:paddingRight="16dip"
- android:src="@drawable/ic_web_holo_dark" />
+ android:src="@drawable/ic_deco_favicon_normal" />
<ImageView
android:id="@+id/new_window_context_menu_id"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:paddingLeft="16dip"
android:paddingRight="16dip"
- android:src="@drawable/ic_new_window_holo_dark" />
+ android:src="@drawable/ic_action_add_tab" />
<ImageView
android:id="@+id/info"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:paddingLeft="16dip"
android:paddingRight="16dip"
- android:src="@drawable/ic_home_info_holo_dark" />
+ android:src="@drawable/ic_deco_info_normal" />
</LinearLayout>
diff --git a/res/layout/bookmarkthumbnailwidget_item.xml b/res/layout/bookmarkthumbnailwidget_item.xml
index 8bc1efb..99df109 100644
--- a/res/layout/bookmarkthumbnailwidget_item.xml
+++ b/res/layout/bookmarkthumbnailwidget_item.xml
@@ -37,7 +37,7 @@
android:layout_marginBottom="2dip">
<ImageView
android:id="@+id/favicon"
- android:src="@drawable/app_web_browser_sm"
+ android:src="@drawable/ic_deco_favicon_normal"
android:layout_width="@dimen/favicon_size"
android:layout_height="@dimen/favicon_size"
android:layout_gravity="center_vertical"
diff --git a/res/layout/bookmarkthumbnailwidget_item_folder.xml b/res/layout/bookmarkthumbnailwidget_item_folder.xml
index 6044164..8722da6 100644
--- a/res/layout/bookmarkthumbnailwidget_item_folder.xml
+++ b/res/layout/bookmarkthumbnailwidget_item_folder.xml
@@ -37,7 +37,7 @@
android:layout_marginBottom="2dip">
<ImageView
android:id="@+id/favicon"
- android:src="@drawable/app_web_browser_sm"
+ android:src="@drawable/ic_deco_favicon_normal"
android:layout_width="@dimen/favicon_size"
android:layout_height="@dimen/favicon_size"
android:layout_gravity="center_vertical"
diff --git a/res/layout/browser_add_bookmark_content.xml b/res/layout/browser_add_bookmark_content.xml
index 58db8a5..8dfe1b4 100644
--- a/res/layout/browser_add_bookmark_content.xml
+++ b/res/layout/browser_add_bookmark_content.xml
@@ -37,7 +37,6 @@
android:id="@+id/add_new_folder"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:drawableLeft="@drawable/ic_add_string"
android:text="@string/new_folder"
android:visibility="gone"
android:focusable="true"
@@ -61,7 +60,7 @@
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:gravity="center_vertical"
- android:drawableLeft="@drawable/ic_bookmark_on_holo_dark"
+ android:drawableLeft="@drawable/ic_action_bookmark_checked"
android:text="@string/bookmark_this_page"
android:textAppearance="?android:attr/textAppearanceMedium" />
<View android:id="@+id/remove_divider"
@@ -76,7 +75,7 @@
android:layout_gravity="center_vertical"
android:gravity="center_vertical"
android:text="@string/remove"
- android:drawableLeft="@drawable/trashcan"
+ android:drawableLeft="@drawable/ic_action_trash_normal"
android:visibility="gone"
android:textAppearance="?android:attr/textAppearanceMedium" />
</LinearLayout>
diff --git a/res/layout/download_settings.xml b/res/layout/download_settings.xml
index ad47363..47d8081 100644
--- a/res/layout/download_settings.xml
+++ b/res/layout/download_settings.xml
@@ -47,7 +47,6 @@
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:gravity="center_vertical"
- android:drawableLeft="@drawable/ic_bookmark_on_holo_dark"
android:text="@string/download_settings_title"
android:textAppearance="?android:attr/textAppearanceMedium" />
diff --git a/res/layout/folder_list_item.xml b/res/layout/folder_list_item.xml
index 46cda37..54de3cf 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_holo_dark" />
+ android:src="@drawable/ic_deco_folder_normal" />
<TextView
android:id="@android:id/text1"
android:layout_width="match_parent"
diff --git a/res/layout/history_item.xml b/res/layout/history_item.xml
index ad07280..031958f 100644
--- a/res/layout/history_item.xml
+++ b/res/layout/history_item.xml
@@ -14,56 +14,59 @@
limitations under the License.
-->
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:minHeight="?android:attr/listPreferredItemHeight"
- android:orientation="horizontal"
- android:paddingLeft="12dip"
- android:paddingRight="8dip"
- >
- <ImageView android:id="@+id/favicon"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:minHeight="?android:attr/listPreferredItemHeight"
+ android:orientation="horizontal">
+
+ <ImageView
+ android:id="@+id/favicon"
android:layout_width="32dip"
android:layout_height="32dip"
android:layout_gravity="center_vertical"
- android:scaleType="fitXY"
+ android:layout_marginLeft="12dip"
android:background="@drawable/bookmark_list_favicon_bg"
- android:src="@drawable/app_web_browser_sm"
- />
- <LinearLayout android:layout_width="0dip"
- android:layout_weight="1"
- android:layout_height="wrap_content"
- android:orientation="vertical"
- android:paddingLeft="8dip"
- android:paddingRight="8dip"
- android:layout_gravity="center_vertical"
- >
- <TextView android:id="@+id/title"
- android:textAppearance="?android:attr/textAppearanceMedium"
- android:maxLines="1"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:singleLine="true"
- android:ellipsize="end"
- />
- <TextView android:id="@+id/url"
- android:textAppearance="?android:attr/textAppearanceSmall"
- android:maxLines="1"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:singleLine="true"
- android:ellipsize="middle"
- />
- </LinearLayout>
- <CheckBox android:id="@+id/star"
+ android:scaleType="fitXY"
+ android:src="@drawable/ic_deco_favicon_normal" />
+
+ <LinearLayout
+ android:layout_width="0dip"
+ android:layout_height="wrap_content"
+ android:layout_gravity="center_vertical"
+ android:layout_weight="1"
+ android:orientation="vertical"
+ android:paddingLeft="8dip"
+ android:paddingRight="8dip">
+
+ <TextView
+ android:id="@+id/title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:paddingTop="16dip"
- android:paddingBottom="16dip"
- android:paddingRight="8dip"
- android:paddingLeft="8dip"
- android:focusable="false"
- android:button="@drawable/btn_checkbox_star"
- android:layout_gravity="center_vertical"
- />
+ android:ellipsize="end"
+ android:maxLines="1"
+ android:singleLine="true"
+ android:textAppearance="?android:attr/textAppearanceMedium" />
+
+ <TextView
+ android:id="@+id/url"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:ellipsize="middle"
+ android:maxLines="1"
+ android:singleLine="true"
+ android:textAppearance="?android:attr/textAppearanceSmall" />
+ </LinearLayout>
+
+ <CheckBox
+ android:id="@+id/star"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_gravity="center"
+ android:button="@drawable/ic_action_bookmark"
+ android:focusable="false"
+ android:paddingBottom="16dip"
+ android:paddingLeft="8dip"
+ android:paddingRight="8dip"
+ android:paddingTop="16dip" />
</LinearLayout>
diff --git a/res/layout/nav_tab_view.xml b/res/layout/nav_tab_view.xml
index 36e2082..a126732 100644
--- a/res/layout/nav_tab_view.xml
+++ b/res/layout/nav_tab_view.xml
@@ -16,11 +16,11 @@
<LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
- android:id="@+id/main"
+ android:id="@+id/nav_tab"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="vertical"
- android:background="@drawable/nav_tab_title"
+ android:background="@drawable/nav_tab_title_normal"
android:focusable="false">
<LinearLayout
android:id="@+id/titlebar"
@@ -49,7 +49,7 @@
android:layout_gravity="center_vertical"
android:contentDescription="@string/accessibility_button_closetab"
android:paddingRight="16dip"
- android:src="@drawable/ic_action_stop" />
+ android:src="@drawable/ic_action_close" />
</LinearLayout>
<!-- Preview Image -->
diff --git a/res/layout/new_folder_layout.xml b/res/layout/new_folder_layout.xml
index dc0fa39..bd34087 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_holo_dark" />
+ android:src="@drawable/ic_deco_folder_normal" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
@@ -50,7 +50,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="center_vertical"
- android:src="@drawable/ic_tab_close"
+ android:src="@drawable/ic_action_close"
android:contentDescription="@string/cancel"
/>
</LinearLayout>
diff --git a/res/layout/suggestion_item.xml b/res/layout/suggestion_item.xml
index 1bc5455..d0075f6 100644
--- a/res/layout/suggestion_item.xml
+++ b/res/layout/suggestion_item.xml
@@ -73,7 +73,7 @@
android:layout_height="match_parent"
android:id="@+id/icon2"
android:scaleType="center"
- android:src="@drawable/ic_querybuilder"
+ android:src="@drawable/ic_action_querybuilder"
android:background="?android:attr/selectableItemBackground"
android:paddingRight="@dimen/suggest_item_padding"
android:paddingLeft="@dimen/suggest_item_padding"
diff --git a/res/layout/tab_title.xml b/res/layout/tab_title.xml
index af78411..f248938 100644
--- a/res/layout/tab_title.xml
+++ b/res/layout/tab_title.xml
@@ -21,7 +21,7 @@
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:gravity="center_vertical"
- android:src="@drawable/ic_incognito_holo_dark"
+ android:src="@drawable/ic_deco_incognito_normal"
android:contentDescription="@string/accessibility_state_incognito"
android:visibility="gone" />
<ImageView
@@ -62,5 +62,5 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:contentDescription="@string/accessibility_button_closetab"
- android:src="@drawable/ic_action_stop" />
+ android:src="@drawable/ic_action_close" />
</merge>
diff --git a/res/layout/title_bar_nav.xml b/res/layout/title_bar_nav.xml
index b9952f1..c412e11 100644
--- a/res/layout/title_bar_nav.xml
+++ b/res/layout/title_bar_nav.xml
@@ -29,15 +29,18 @@
<ImageView
android:id="@+id/incognito_icon"
- android:layout_width="48dp"
+ android:layout_width="wrap_content"
android:layout_height="match_parent"
- android:src="@drawable/ic_incognito_holo_dark"
+ android:layout_gravity="center"
+ android:layout_marginLeft="8dp"
+ android:src="@drawable/ic_deco_incognito_normal"
android:visibility="gone" />
<com.android.browser.LocationButton
android:id="@+id/location_button"
style="@style/NavButton"
android:layout_width="wrap_content"
+ android:paddingRight="2dp"
android:visibility="gone" />
<ImageView
@@ -61,7 +64,8 @@
android:layout_height="32dip"
android:layout_gravity="center"
android:paddingLeft="6dip"
- android:paddingRight="6dip" />
+ android:paddingRight="6dip"
+ android:scaleType="fitCenter" />
<ImageView
android:id="@+id/lock"
@@ -100,6 +104,7 @@
android:paddingRight="6dp"
android:scrollHorizontally="true"
android:singleLine="true"
+ android:fontFamily="sans-serif-condensed"
android:textAppearance="?android:attr/textAppearanceMedium" />
<ImageView
@@ -108,7 +113,7 @@
android:layout_width="wrap_content"
android:contentDescription="@string/accessibility_button_voice"
android:paddingRight="4dip"
- android:src="@drawable/ic_voice_search_holo_dark"
+ android:src="@drawable/ic_action_microphone_normal"
android:visibility="gone" />
<ImageButton
@@ -136,11 +141,12 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
+ android:clickable="false"
android:paddingBottom="3dp"
android:paddingRight="2dp"
- android:clickable="false"
- android:text="0" >
- </TextView>
+ android:textColor="#333"
+ android:textSize="13dp"
+ android:textStyle="bold" />
</FrameLayout>
<ImageButton
diff --git a/res/menu-sw600dp/combined.xml b/res/menu-sw600dp/combined.xml
index 97abc8d..85cda26 100644
--- a/res/menu-sw600dp/combined.xml
+++ b/res/menu-sw600dp/combined.xml
@@ -18,7 +18,6 @@
<item
android:id="@+id/preferences_menu_id"
android:title="@string/menu_preferences"
- android:icon="@drawable/ic_settings_holo_dark"
android:alphabeticShortcut="p"
android:showAsAction="ifRoom"
android:orderInCategory="1000" />
diff --git a/res/menu/bookmark.xml b/res/menu/bookmark.xml
index b43d7ce..b7279aa 100644
--- a/res/menu/bookmark.xml
+++ b/res/menu/bookmark.xml
@@ -15,10 +15,10 @@
-->
<menu xmlns:android="http://schemas.android.com/apk/res/android">
- <item android:id="@+id/add_bookmark_menu_id"
- android:title="@string/add_new_bookmark"
- android:icon="@drawable/ic_add_string"/>
- <item android:id="@+id/new_bmfolder_menu_id"
- android:title="@string/new_folder"
- android:icon="@drawable/ic_add_string"/>
+ <item
+ android:id="@+id/add_bookmark_menu_id"
+ android:title="@string/add_new_bookmark" />
+ <item
+ android:id="@+id/new_bmfolder_menu_id"
+ android:title="@string/new_folder" />
</menu>
diff --git a/res/menu/browser.xml b/res/menu/browser.xml
index 32dc6ca..67915fe 100644
--- a/res/menu/browser.xml
+++ b/res/menu/browser.xml
@@ -50,12 +50,11 @@
android:id="@+id/incognito_menu_id"
android:title="@string/new_incognito_tab"
android:icon="@drawable/ic_action_add_incognito" />
-
<!--
<item
android:id="@+id/close_other_tabs_id"
android:title="@string/close_other_tabs"
- android:icon="@drawable/ic_tab_close" />
+ android:icon="@drawable/ic_action_close" />
-->
</menu>
</item>
diff --git a/res/raw-ar/incognito_mode_start_page.html b/res/raw-ar/incognito_mode_start_page.html
index 842bf6e..7bd64ce 100644
--- a/res/raw-ar/incognito_mode_start_page.html
+++ b/res/raw-ar/incognito_mode_start_page.html
@@ -33,6 +33,7 @@
<head>
<meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=no"/>
<title>صفحة SWE للتصفح المتخفي</title>
+ <style type="text/css">body { margin: 0; padding: 1em; }</style>
</head>
<body>
<p>
diff --git a/res/raw-es/incognito_mode_start_page.html b/res/raw-es/incognito_mode_start_page.html
index b87aaaf..75f4cce 100644
--- a/res/raw-es/incognito_mode_start_page.html
+++ b/res/raw-es/incognito_mode_start_page.html
@@ -31,6 +31,7 @@
<head>
<meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=no"/>
<title>Página de incógnito SWE</title>
+ <style type="text/css">body { margin: 0; padding: 1em; }</style>
</head>
<body>
<p>
diff --git a/res/raw-hi/incognito_mode_start_page.html b/res/raw-hi/incognito_mode_start_page.html
index 60db65d..b7d1049 100644
--- a/res/raw-hi/incognito_mode_start_page.html
+++ b/res/raw-hi/incognito_mode_start_page.html
@@ -32,6 +32,7 @@
<head>
<meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=no"/>
<title>SWE इनकॉग्निटो पृष्ठ</title>
+ <style type="text/css">body { margin: 0; padding: 1em; }</style>
</head>
<body>
<p>
diff --git a/res/raw-ru/incognito_mode_start_page.html b/res/raw-ru/incognito_mode_start_page.html
index 474668a..c7f1945 100644
--- a/res/raw-ru/incognito_mode_start_page.html
+++ b/res/raw-ru/incognito_mode_start_page.html
@@ -31,6 +31,7 @@
<head>
<meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=no"/>
<title>Страница "инкогнито" SWE</title>
+ <style type="text/css">body { margin: 0; padding: 1em; }</style>
</head>
<body>
<p>
diff --git a/res/raw-th/incognito_mode_start_page.html b/res/raw-th/incognito_mode_start_page.html
index 21264a7..d9a2299 100644
--- a/res/raw-th/incognito_mode_start_page.html
+++ b/res/raw-th/incognito_mode_start_page.html
@@ -32,6 +32,7 @@
<head>
<meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=no"/>
<title>หน้าแบบไม่เปิดเผย SWE</title>
+ <style type="text/css">body { margin: 0; padding: 1em; }</style>
</head>
<body>
<p>
diff --git a/res/raw-tl/incognito_mode_start_page.html b/res/raw-tl/incognito_mode_start_page.html
index f14402f..2a139fd 100644
--- a/res/raw-tl/incognito_mode_start_page.html
+++ b/res/raw-tl/incognito_mode_start_page.html
@@ -31,6 +31,7 @@
<head>
<meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=no"/>
<title>SWE Incognito Pahina</title>
+ <style type="text/css">body { margin: 0; padding: 1em; }</style>
</head>
<body>
<p>
diff --git a/res/raw-tr/incognito_mode_start_page.html b/res/raw-tr/incognito_mode_start_page.html
index 32d6fd8..77d9e56 100644
--- a/res/raw-tr/incognito_mode_start_page.html
+++ b/res/raw-tr/incognito_mode_start_page.html
@@ -32,6 +32,7 @@
<head>
<meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=no"/>
<title>SWE Incognito Sayfası</title>
+ <style type="text/css">body { margin: 0; padding: 1em; }</style>
</head>
<body>
<p>
diff --git a/res/raw-vi/incognito_mode_start_page.html b/res/raw-vi/incognito_mode_start_page.html
index 449e27c..973cf9e 100644
--- a/res/raw-vi/incognito_mode_start_page.html
+++ b/res/raw-vi/incognito_mode_start_page.html
@@ -32,6 +32,7 @@
<head>
<meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=no"/>
<title>Trang ẩn danh SWE</title>
+ <style type="text/css">body { margin: 0; padding: 1em; }</style>
</head>
<body>
<p>
diff --git a/res/raw-zh-rCN/incognito_mode_start_page.html b/res/raw-zh-rCN/incognito_mode_start_page.html
index acf3ed8..c2d6d4a 100644
--- a/res/raw-zh-rCN/incognito_mode_start_page.html
+++ b/res/raw-zh-rCN/incognito_mode_start_page.html
@@ -31,6 +31,7 @@
<head>
<meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=no"/>
<title>SWE 浏览器隐身模式</title>
+ <style type="text/css">body { margin: 0; padding: 1em; }</style>
</head>
<body>
<p>
diff --git a/res/raw-zh-rHK/incognito_mode_start_page.html b/res/raw-zh-rHK/incognito_mode_start_page.html
index b8e4f52..83c4787 100644
--- a/res/raw-zh-rHK/incognito_mode_start_page.html
+++ b/res/raw-zh-rHK/incognito_mode_start_page.html
@@ -32,6 +32,7 @@
<head>
<meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=no"/>
<title>SWE 無痕式網頁</title>
+ <style type="text/css">body { margin: 0; padding: 1em; }</style>
</head>
<body>
<p>
diff --git a/res/raw/incognito_mode_start_page.html b/res/raw/incognito_mode_start_page.html
index d3f0d65..fd0d98d 100644
--- a/res/raw/incognito_mode_start_page.html
+++ b/res/raw/incognito_mode_start_page.html
@@ -32,7 +32,8 @@
<html>
<head>
<meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=no"/>
- <title>Incognito Page</title>
+ <title>Private Browsing</title>
+ <style type="text/css">body { margin: 0; padding: 1em; }</style>
</head>
<body>
<p>
diff --git a/res/values/colors.xml b/res/values/colors.xml
index 31853ac..a7b76a1 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -28,7 +28,8 @@
<color name="browser_window_background">#ffffff</color>
<!-- derived colors -->
- <color name="NavigationBarBackground">#ffffff</color> <!-- reference: f2f2f2 -->
+ <color name="NavigationBarBackground">#ffffff</color>
+ <color name="NavigationBarBackgroundIncognito">#cccccc</color>
<color name="NavigationBarUnderline">#b3b3b3</color>
<color name="PopupBackground">#ffffff</color>
<color name="TabNavBackgroundColor">#757575</color>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 10fa74f..9bd2aae 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -39,7 +39,7 @@
</string>
<!-- Name of menu item of a new incognito tab. Also used in the
title bar when displaying a new tab [CHAR LIMIT=30] -->
- <string name="new_incognito_tab">New incognito tab</string>
+ <string name="new_incognito_tab">Private Browsing</string>
<!-- Name of tab containing bookmarks -->
<string name="tab_bookmarks">Bookmarks</string>
<!-- Name of tab containing the user's most visited websites, organized by number of visits -->
@@ -80,7 +80,7 @@
<string name="msg_no_google_play">Sorry, Google Play store app does not exist.</string>
<!-- Menu item -->
- <string name="page_info">Page info</string>
+ <string name="page_info">Page information</string>
<!-- Label for a button on an SSL error dialog that allows the user to see
Page info screen for the current page -->
<string name="page_info_view">View page info</string>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index d97a286..db4ac91 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -66,6 +66,9 @@
<style name="ShortcutTheme" parent="@style/BrowserBase">
</style>
+ <style name="SettingsTheme" parent="@style/BrowserBase">
+ </style>
+
<style name="NavButton">
<item name="android:background">?android:attr/selectableItemBackground</item>
@@ -79,8 +82,9 @@
<style name="OverflowButton" parent="@android:style/Widget.Holo.Light.ActionButton.Overflow">
<item name="android:src">@drawable/ic_action_overflow</item>
- <item name="android:layout_width">48dp</item>
+ <item name="android:layout_width">44dp</item>
<item name="android:layout_height">match_parent</item>
+ <item name="android:paddingLeft">4dp</item>
<item name="android:gravity">center_vertical</item>
</style>
diff --git a/res_v21/values-v21/styles.xml b/res_v21/values-v21/styles.xml
index 4a02338..b362b77 100644
--- a/res_v21/values-v21/styles.xml
+++ b/res_v21/values-v21/styles.xml
@@ -55,4 +55,14 @@
<style name="TextAppearance.Medium" parent="@android:style/TextAppearance.Material.Medium" />
<style name="TextAppearance.Small" parent="@android:style/TextAppearance.Material.Small" />
+ <!-- level 2 parents -->
+
+ <!-- common theme elements -->
+
+ <style name="SettingsTheme" parent="@android:style/Theme.Material.Light.DarkActionBar">
+ <item name="android:colorPrimary">@color/accent</item>
+ <item name="android:colorAccent">@color/accent</item>
+ <item name="android:colorEdgeEffect">@color/accent</item>
+ </style>
+
</resources>
diff --git a/src/com/android/browser/AddBookmarkFolder.java b/src/com/android/browser/AddBookmarkFolder.java
index c6dc653..b468da2 100644
--- a/src/com/android/browser/AddBookmarkFolder.java
+++ b/src/com/android/browser/AddBookmarkFolder.java
@@ -640,7 +640,7 @@
mCrumbs = (BreadCrumbView) findViewById(R.id.crumbs);
mCrumbs.setUseBackButton(true);
mCrumbs.setController(this);
- mHeaderIcon = getResources().getDrawable(R.drawable.ic_folder_holo_dark);
+ mHeaderIcon = getResources().getDrawable(R.drawable.ic_deco_folder_normal);
mCrumbHolder = findViewById(R.id.crumb_holder);
mCrumbs.setMaxVisible(MAX_CRUMBS_SHOWN);
diff --git a/src/com/android/browser/AddBookmarkPage.java b/src/com/android/browser/AddBookmarkPage.java
index 0ae1032..9d757d4 100644
--- a/src/com/android/browser/AddBookmarkPage.java
+++ b/src/com/android/browser/AddBookmarkPage.java
@@ -702,7 +702,7 @@
mCrumbs = (BreadCrumbView) findViewById(R.id.crumbs);
mCrumbs.setUseBackButton(true);
mCrumbs.setController(this);
- mHeaderIcon = getResources().getDrawable(R.drawable.ic_folder_holo_dark);
+ mHeaderIcon = getResources().getDrawable(R.drawable.ic_deco_folder_normal);
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 8e1e62c..92c5d46 100644
--- a/src/com/android/browser/BaseUi.java
+++ b/src/com/android/browser/BaseUi.java
@@ -164,7 +164,7 @@
protected Drawable getGenericFavicon() {
if (mGenericFavicon == null) {
- mGenericFavicon = mActivity.getResources().getDrawable(R.drawable.app_web_browser_sm);
+ mGenericFavicon = mActivity.getResources().getDrawable(R.drawable.ic_deco_favicon_normal);
}
return mGenericFavicon;
}
diff --git a/src/com/android/browser/BookmarkItem.java b/src/com/android/browser/BookmarkItem.java
index b41ee00..eccc438 100644
--- a/src/com/android/browser/BookmarkItem.java
+++ b/src/com/android/browser/BookmarkItem.java
@@ -93,7 +93,7 @@
if (b != null) {
mImageView.setImageBitmap(b);
} else {
- mImageView.setImageResource(R.drawable.app_web_browser_sm);
+ mImageView.setImageResource(R.drawable.ic_deco_favicon_normal);
}
}
diff --git a/src/com/android/browser/BrowserActivity.java b/src/com/android/browser/BrowserActivity.java
index 4b9f48c..8569550 100644
--- a/src/com/android/browser/BrowserActivity.java
+++ b/src/com/android/browser/BrowserActivity.java
@@ -276,7 +276,10 @@
Log.v(LOGTAG, "BrowserActivity.onDestroy: this=" + this);
}
super.onDestroy();
- mEngineInitializer.onActivityDestroy();
+ // mEngineInitializer can be null if onCreate is not called before onDestroy
+ // it happens when starting the activity with an intent while the screen is locked.
+ if (mEngineInitializer != null)
+ mEngineInitializer.onActivityDestroy();
mController.onDestroy();
mController = NullController.INSTANCE;
}
diff --git a/src/com/android/browser/BrowserBookmarksPage.java b/src/com/android/browser/BrowserBookmarksPage.java
index 7abe07b..3fea1ed 100644
--- a/src/com/android/browser/BrowserBookmarksPage.java
+++ b/src/com/android/browser/BrowserBookmarksPage.java
@@ -321,7 +321,7 @@
if (isFolder) {
item.setUrl(null);
Bitmap bitmap =
- BitmapFactory.decodeResource(getResources(), R.drawable.ic_folder_holo_dark);
+ BitmapFactory.decodeResource(getResources(), R.drawable.ic_deco_folder_normal);
item.setFavicon(bitmap);
new LookupBookmarkCount(getActivity(), item)
.execute(cursor.getLong(BookmarksLoader.COLUMN_INDEX_ID));
diff --git a/src/com/android/browser/BrowserPreferencesPage.java b/src/com/android/browser/BrowserPreferencesPage.java
index 3765452..8f31ef9 100644
--- a/src/com/android/browser/BrowserPreferencesPage.java
+++ b/src/com/android/browser/BrowserPreferencesPage.java
@@ -17,18 +17,40 @@
package com.android.browser;
import android.app.Activity;
+import android.content.Intent;
import android.os.Bundle;
+import android.preference.PreferenceActivity;
import com.android.browser.preferences.GeneralPreferencesFragment;
public class BrowserPreferencesPage extends Activity {
- public static final String CURRENT_PAGE = "currentPage";
+ public static void startPreferencesForResult(Activity callerActivity, String url, int requestCode) {
+ final Intent intent = new Intent(callerActivity, BrowserPreferencesPage.class);
+ intent.putExtra(GeneralPreferencesFragment.EXTRA_CURRENT_PAGE, url);
+ callerActivity.startActivityForResult(intent, requestCode);
+ }
+
+ public static void startPreferenceFragmentForResult(Activity callerActivity, String fragmentName, int requestCode) {
+ final Intent intent = new Intent(callerActivity, BrowserPreferencesPage.class);
+ intent.putExtra(PreferenceActivity.EXTRA_SHOW_FRAGMENT, fragmentName);
+ callerActivity.startActivityForResult(intent, requestCode);
+ }
+
@Override
public void onCreate(Bundle icicle) {
super.onCreate(icicle);
+ Intent intent = getIntent();
+ if (intent != null) {
+ String action = intent.getAction();
+ // check if this page was invoked by 'App Data Usage' on the global data monitor
+ if ("android.intent.action.MANAGE_NETWORK_USAGE".equals(action)) {
+ // TODO: switch to the Network fragment here?
+ }
+ }
+
getFragmentManager().beginTransaction().replace(android.R.id.content,
new GeneralPreferencesFragment()).commit();
}
diff --git a/src/com/android/browser/ComboViewActivity.java b/src/com/android/browser/ComboViewActivity.java
index 4026bdd..5ce20fc 100644
--- a/src/com/android/browser/ComboViewActivity.java
+++ b/src/com/android/browser/ComboViewActivity.java
@@ -28,7 +28,6 @@
import android.view.Menu;
import android.view.MenuItem;
-import com.android.browser.R;
import com.android.browser.UI.ComboViews;
import java.util.ArrayList;
@@ -143,9 +142,7 @@
return true;
} else if (item.getItemId() == R.id.preferences_menu_id) {
String url = getIntent().getStringExtra(EXTRA_CURRENT_URL);
- Intent intent = new Intent(this, BrowserPreferencesPage.class);
- intent.putExtra(BrowserPreferencesPage.CURRENT_PAGE, url);
- startActivityForResult(intent, Controller.PREFERENCES_PAGE);
+ BrowserPreferencesPage.startPreferencesForResult(this, url, Controller.PREFERENCES_PAGE);
return true;
}
return super.onOptionsItemSelected(item);
diff --git a/src/com/android/browser/Controller.java b/src/com/android/browser/Controller.java
index 77f4032..62dff92 100644
--- a/src/com/android/browser/Controller.java
+++ b/src/com/android/browser/Controller.java
@@ -2236,10 +2236,7 @@
@Override
public void openPreferences() {
- Intent intent = new Intent(mActivity, BrowserPreferencesPage.class);
- intent.putExtra(BrowserPreferencesPage.CURRENT_PAGE,
- getCurrentTopWebView().getUrl());
- mActivity.startActivityForResult(intent, PREFERENCES_PAGE);
+ BrowserPreferencesPage.startPreferencesForResult(mActivity, getCurrentTopWebView().getUrl(), PREFERENCES_PAGE);
}
@Override
@@ -3373,11 +3370,9 @@
// Open the settings activity at the AutoFill profile fragment so that
// the user can create a new profile. When they return, we will dispatch
// the message so that we can autofill the form using their new profile.
- Intent intent = new Intent(mActivity, BrowserPreferencesPage.class);
- intent.putExtra(PreferenceActivity.EXTRA_SHOW_FRAGMENT,
- AutoFillSettingsFragment.class.getName());
mAutoFillSetupMessage = message;
- mActivity.startActivityForResult(intent, AUTOFILL_SETUP);
+ BrowserPreferencesPage.startPreferenceFragmentForResult(mActivity,
+ AutoFillSettingsFragment.class.getName(), AUTOFILL_SETUP);
}
@Override
diff --git a/src/com/android/browser/NavTabView.java b/src/com/android/browser/NavTabView.java
index 3bcd7a2..49bd080 100644
--- a/src/com/android/browser/NavTabView.java
+++ b/src/com/android/browser/NavTabView.java
@@ -58,7 +58,7 @@
private void init() {
LayoutInflater.from(getContext()).inflate(R.layout.nav_tab_view, this);
- mContent = (ViewGroup) findViewById(R.id.main);
+ mContent = (ViewGroup) findViewById(R.id.nav_tab);
mClose = (ImageView) findViewById(R.id.closetab);
mTitle = (TextView) findViewById(R.id.title);
mTitleBar = findViewById(R.id.titlebar);
@@ -89,9 +89,12 @@
mTitle.setText(txt);
}
if (mTab.isSnapshot()) {
- setTitleIcon(R.drawable.ic_history_holo_dark);
+ setTitleIcon(R.drawable.ic_suggest_history_normal);
} else if (mTab.isPrivateBrowsingEnabled()) {
- setTitleIcon(R.drawable.ic_incognito_holo_dark);
+ mContent.setBackgroundResource(R.drawable.nav_tab_title_incognito);
+ mTitle.setTextColor(getResources().getColor(R.color.white));
+ mClose.setImageResource(R.drawable.ic_action_close_inverted);
+ setTitleIcon(R.drawable.ic_deco_incognito_normal);
} else {
setTitleIcon(0);
}
diff --git a/src/com/android/browser/NavigationBarPhone.java b/src/com/android/browser/NavigationBarPhone.java
index f528e8f..e73f218 100644
--- a/src/com/android/browser/NavigationBarPhone.java
+++ b/src/com/android/browser/NavigationBarPhone.java
@@ -244,7 +244,11 @@
@Override
public void onTabDataChanged(Tab tab) {
super.onTabDataChanged(tab);
- mIncognitoIcon.setVisibility(tab.isPrivateBrowsingEnabled()
- ? View.VISIBLE : View.GONE);
+ boolean isPrivate = tab.isPrivateBrowsingEnabled();
+ mIncognitoIcon.setVisibility(isPrivate ? View.VISIBLE : View.GONE);
+ // change the background to a darker tone to reflect the 'incognito' state
+ setBackgroundColor(getResources().getColor(isPrivate ?
+ R.color.NavigationBarBackgroundIncognito : R.color.NavigationBarBackground));
+
}
}
diff --git a/src/com/android/browser/SnapshotBar.java b/src/com/android/browser/SnapshotBar.java
index 9446b29..d17a3ac 100644
--- a/src/com/android/browser/SnapshotBar.java
+++ b/src/com/android/browser/SnapshotBar.java
@@ -226,8 +226,8 @@
}
public void setFavicon(Bitmap icon) {
- if (mFavicon == null) return;
- mFavicon.setImageDrawable(mTitleBar.getUi().getFaviconDrawable(icon));
+ if (mFavicon != null)
+ mFavicon.setImageDrawable(mTitleBar.getUi().getFaviconDrawable(icon));
}
public boolean isAnimating() {
diff --git a/src/com/android/browser/Tab.java b/src/com/android/browser/Tab.java
index 9964413..4e68c11 100644
--- a/src/com/android/browser/Tab.java
+++ b/src/com/android/browser/Tab.java
@@ -210,7 +210,7 @@
private static synchronized Bitmap getDefaultFavicon(Context context) {
if (sDefaultFavicon == null) {
sDefaultFavicon = BitmapFactory.decodeResource(
- context.getResources(), R.drawable.app_web_browser_sm);
+ context.getResources(), R.drawable.ic_deco_favicon_normal);
}
return sDefaultFavicon;
}
diff --git a/src/com/android/browser/addbookmark/FolderSpinnerAdapter.java b/src/com/android/browser/addbookmark/FolderSpinnerAdapter.java
index f86c9c6..c7d24f7 100644
--- a/src/com/android/browser/addbookmark/FolderSpinnerAdapter.java
+++ b/src/com/android/browser/addbookmark/FolderSpinnerAdapter.java
@@ -69,17 +69,17 @@
switch (position) {
case HOME_SCREEN:
labelResource = R.string.add_to_homescreen_menu_option;
- drawableResource = R.drawable.ic_home_holo_dark;
+ drawableResource = R.drawable.ic_deco_home_normal;
break;
case ROOT_FOLDER:
labelResource = R.string.add_to_bookmarks_menu_option;
- drawableResource = R.drawable.ic_bookmarks_holo_dark;
+ drawableResource = R.drawable.ic_deco_bookmarks_normal;
break;
case RECENT_FOLDER:
// Fall through and use the same icon resource
case OTHER_FOLDER:
labelResource = R.string.add_to_other_folder_menu_option;
- drawableResource = R.drawable.ic_folder_holo_dark;
+ drawableResource = R.drawable.ic_deco_folder_normal;
break;
default:
labelResource = 0;
diff --git a/src/com/android/browser/preferences/GeneralPreferencesFragment.java b/src/com/android/browser/preferences/GeneralPreferencesFragment.java
index f280766..6937ac5 100644
--- a/src/com/android/browser/preferences/GeneralPreferencesFragment.java
+++ b/src/com/android/browser/preferences/GeneralPreferencesFragment.java
@@ -42,7 +42,6 @@
import android.widget.TextView.OnEditorActionListener;
import com.android.browser.AutoFillSettingsFragment;
-import com.android.browser.BrowserPreferencesPage;
import com.android.browser.BrowserSettings;
import com.android.browser.PreferenceKeys;
import com.android.browser.R;
@@ -54,6 +53,8 @@
static final String TAG = "PersonalPreferencesFragment";
+ public static final String EXTRA_CURRENT_PAGE = "currentPage";
+
static final String BLANK_URL = "about:blank";
static final String CURRENT = "current";
static final String BLANK = "blank";
@@ -75,8 +76,7 @@
Resources res = getActivity().getResources();
mChoices = res.getStringArray(R.array.pref_homepage_choices);
mValues = res.getStringArray(R.array.pref_homepage_values);
- mCurrentPage = getActivity().getIntent()
- .getStringExtra(BrowserPreferencesPage.CURRENT_PAGE);
+ mCurrentPage = getActivity().getIntent().getStringExtra(EXTRA_CURRENT_PAGE);
// Load the XML preferences file
addPreferencesFromResource(R.xml.general_preferences);
diff --git a/src/com/android/browser/preferences/WebsiteSettingsFragment.java b/src/com/android/browser/preferences/WebsiteSettingsFragment.java
index 49bd98e..601305e 100644
--- a/src/com/android/browser/preferences/WebsiteSettingsFragment.java
+++ b/src/com/android/browser/preferences/WebsiteSettingsFragment.java
@@ -223,7 +223,7 @@
mResource = rsc;
mInflater = (LayoutInflater)context.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
mDefaultIcon = BitmapFactory.decodeResource(getResources(),
- R.drawable.app_web_browser_sm);
+ R.drawable.ic_deco_favicon_normal);
mUsageEmptyIcon = BitmapFactory.decodeResource(getResources(),
R.drawable.ic_list_data_off);
mUsageLowIcon = BitmapFactory.decodeResource(getResources(),
diff --git a/src/com/android/browser/provider/BrowserProvider2.java b/src/com/android/browser/provider/BrowserProvider2.java
index e2e22c9..ece565b 100644
--- a/src/com/android/browser/provider/BrowserProvider2.java
+++ b/src/com/android/browser/provider/BrowserProvider2.java
@@ -130,8 +130,8 @@
qualifyColumn(TABLE_HISTORY, History.URL),
bookmarkOrHistoryColumn(Combined.TITLE),
bookmarkOrHistoryLiteral(Combined.URL,
- Integer.toString(R.drawable.ic_bookmark_off_holo_dark),
- Integer.toString(R.drawable.ic_history_holo_dark)),
+ Integer.toString(R.drawable.ic_action_bookmark_normal),
+ Integer.toString(R.drawable.ic_suggest_history_normal)),
qualifyColumn(TABLE_HISTORY, History.DATE_LAST_VISITED)};
private static final String SUGGEST_SELECTION =
diff --git a/src/com/android/browser/widget/BookmarkThumbnailWidgetService.java b/src/com/android/browser/widget/BookmarkThumbnailWidgetService.java
index 6c80695..c818191 100644
--- a/src/com/android/browser/widget/BookmarkThumbnailWidgetService.java
+++ b/src/com/android/browser/widget/BookmarkThumbnailWidgetService.java
@@ -266,7 +266,7 @@
R.drawable.thumb_bookmark_widget_folder_holo);
}
views.setImageViewResource(R.id.favicon,
- R.drawable.ic_bookmark_widget_bookmark_holo_dark);
+ R.drawable.ic_deco_bookmarks_normal);
// SWE_TODO : Fix Me
//views.setDrawableParameters(R.id.thumb, true, 0, -1, null, -1);
} else {
@@ -292,7 +292,7 @@
views.setImageViewBitmap(R.id.favicon, favicon);
} else {
views.setImageViewResource(R.id.favicon,
- R.drawable.app_web_browser_sm);
+ R.drawable.ic_deco_favicon_normal);
}
}
Intent fillin;
diff --git a/src_system/AndroidManifest.xml b/src_system/AndroidManifest.xml
index 0293063..9a285bb 100644
--- a/src_system/AndroidManifest.xml
+++ b/src_system/AndroidManifest.xml
@@ -62,7 +62,8 @@
android:icon="@mipmap/ic_launcher_browser"
android:backupAgent=".BrowserBackupAgent"
android:hardwareAccelerated="true"
- android:taskAffinity="android.task.browser" >
+ android:taskAffinity="android.task.browser"
+ android:theme="@style/BrowserBase" >
<uses-library android:name="com.qrd.useragent"
android:required="false" />
@@ -178,7 +179,9 @@
</intent-filter>
</activity>
- <activity android:name="BrowserPreferencesPage" android:label="@string/menu_preferences">
+ <activity android:name="BrowserPreferencesPage" android:label="@string/menu_preferences"
+ android:parentActivityName=".BrowserActivity"
+ android:theme="@style/SettingsTheme">
<intent-filter>
<action android:name="android.intent.action.MANAGE_NETWORK_USAGE" />
<category android:name="android.intent.category.DEFAULT" />
@@ -255,7 +258,7 @@
android:name=".widget.BookmarkWidgetProxy"
android:exported="false" />
<activity android:name=".widget.BookmarkWidgetConfigure"
- android:theme="@android:style/Theme.Holo.DialogWhenLarge">
+ android:theme="@style/DialogWhenLarge">
<intent-filter>
<action android:name="android.appwidget.action.APPWIDGET_CONFIGURE"/>
</intent-filter>
