Clean visual style: move to Light, add Material support, change Drawables (progress, icons).
This code alters the visual style moving the APP to a Light theme.
Parents of the theme are either Theme.Holo.Light or Theme.Material.Light
depending on which API we start the APK from. Needs SDK 21 to build.
Other than the visual changes, this commit changes:
- name of the APP to 'Browser'
- animations and sequencing of the Tab switcher in {nav/anim}_screen
- removal of the warning icon from the Exit dialog
- change of the favicon appearance (removal of the double border)
Vast amount of unused resources are removed from the APK. Just XHDPI
drawables have been synthesized for now, and the Primary color was
used for the icons and is accessible in R.color.Primary.
Change-Id: If75cc051c5d4015383e96066cdb6507484e625d8
diff --git a/res/drawable-hdpi/browsertab_inactive.png b/res/drawable-hdpi/browsertab_inactive.png
deleted file mode 100644
index eb2f4d9..0000000
--- a/res/drawable-hdpi/browsertab_inactive.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/deco_progress_bar.9.png b/res/drawable-hdpi/deco_progress_bar.9.png
new file mode 100644
index 0000000..821b870
--- /dev/null
+++ b/res/drawable-hdpi/deco_progress_bar.9.png
Binary files differ
diff --git a/res/drawable-hdpi/geolocation_permissions_prompt_background.9.png b/res/drawable-hdpi/geolocation_permissions_prompt_background.9.png
deleted file mode 100644
index 1604a3d..0000000
--- a/res/drawable-hdpi/geolocation_permissions_prompt_background.9.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
deleted file mode 100644
index eca8a56..0000000
--- a/res/drawable-hdpi/ic_back_disabled_holo_dark.png
+++ /dev/null
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
deleted file mode 100644
index ed99557..0000000
--- a/res/drawable-hdpi/ic_back_hierarchy_holo_dark.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_back_holo_dark.png b/res/drawable-hdpi/ic_back_holo_dark.png
deleted file mode 100644
index 5e31b19..0000000
--- a/res/drawable-hdpi/ic_back_holo_dark.png
+++ /dev/null
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
deleted file mode 100644
index 60bcd4c..0000000
--- a/res/drawable-hdpi/ic_close_window_holo_dark.png
+++ /dev/null
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
deleted file mode 100644
index 9330b92..0000000
--- a/res/drawable-hdpi/ic_forward_disabled_holo_dark.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_forward_holo_dark.png b/res/drawable-hdpi/ic_forward_holo_dark.png
deleted file mode 100644
index d5a5fa7..0000000
--- a/res/drawable-hdpi/ic_forward_holo_dark.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_gps_denied_holo_dark.png b/res/drawable-hdpi/ic_gps_denied_holo_dark.png
deleted file mode 100644
index 5bd9c39..0000000
--- a/res/drawable-hdpi/ic_gps_denied_holo_dark.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_gps_on_holo_dark.png b/res/drawable-hdpi/ic_gps_on_holo_dark.png
deleted file mode 100644
index e736362..0000000
--- a/res/drawable-hdpi/ic_gps_on_holo_dark.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_menu_forward.png b/res/drawable-hdpi/ic_menu_forward.png
deleted file mode 100644
index b1b0c89..0000000
--- a/res/drawable-hdpi/ic_menu_forward.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_menu_moreoverflow_normal_holo_dark.png b/res/drawable-hdpi/ic_menu_moreoverflow_normal_holo_dark.png
deleted file mode 100644
index 2abc458..0000000
--- a/res/drawable-hdpi/ic_menu_moreoverflow_normal_holo_dark.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_menu_overflow.png b/res/drawable-hdpi/ic_menu_overflow.png
deleted file mode 100644
index a12aedf..0000000
--- a/res/drawable-hdpi/ic_menu_overflow.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_menu_refresh.png b/res/drawable-hdpi/ic_menu_refresh.png
deleted file mode 100644
index e13315f..0000000
--- a/res/drawable-hdpi/ic_menu_refresh.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_menu_stop.png b/res/drawable-hdpi/ic_menu_stop.png
deleted file mode 100644
index cf53a08..0000000
--- a/res/drawable-hdpi/ic_menu_stop.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_new_incognito_holo_dark.png b/res/drawable-hdpi/ic_new_incognito_holo_dark.png
deleted file mode 100644
index 2d2f5bf..0000000
--- a/res/drawable-hdpi/ic_new_incognito_holo_dark.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_refresh_holo_dark.png b/res/drawable-hdpi/ic_refresh_holo_dark.png
deleted file mode 100644
index b335c0f..0000000
--- a/res/drawable-hdpi/ic_refresh_holo_dark.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_search_category_bookmark.png b/res/drawable-hdpi/ic_search_category_bookmark.png
deleted file mode 100644
index bdecfd0..0000000
--- a/res/drawable-hdpi/ic_search_category_bookmark.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_search_category_browser.png b/res/drawable-hdpi/ic_search_category_browser.png
deleted file mode 100644
index 30b7a1e..0000000
--- a/res/drawable-hdpi/ic_search_category_browser.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_search_category_history.png b/res/drawable-hdpi/ic_search_category_history.png
deleted file mode 100644
index 94c89ae..0000000
--- a/res/drawable-hdpi/ic_search_category_history.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_search_category_suggest.png b/res/drawable-hdpi/ic_search_category_suggest.png
deleted file mode 100644
index 165a11d..0000000
--- a/res/drawable-hdpi/ic_search_category_suggest.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_search_holo_dark.png b/res/drawable-hdpi/ic_search_holo_dark.png
deleted file mode 100644
index b33d638..0000000
--- a/res/drawable-hdpi/ic_search_holo_dark.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_share_holo_dark.png b/res/drawable-hdpi/ic_share_holo_dark.png
deleted file mode 100644
index 2094394..0000000
--- a/res/drawable-hdpi/ic_share_holo_dark.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_stop_holo_dark.png b/res/drawable-hdpi/ic_stop_holo_dark.png
deleted file mode 100644
index 60bcd4c..0000000
--- a/res/drawable-hdpi/ic_stop_holo_dark.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_windows_holo_dark.png b/res/drawable-hdpi/ic_windows_holo_dark.png
deleted file mode 100644
index cfc3f70..0000000
--- a/res/drawable-hdpi/ic_windows_holo_dark.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/list_selector_pressed_holo_dark.9.png b/res/drawable-hdpi/list_selector_pressed_holo_dark.9.png
deleted file mode 100644
index 0ed5ba3..0000000
--- a/res/drawable-hdpi/list_selector_pressed_holo_dark.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/magnifying_glass.png b/res/drawable-hdpi/magnifying_glass.png
deleted file mode 100644
index a3898b0..0000000
--- a/res/drawable-hdpi/magnifying_glass.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/nav_tab_bg.9.png b/res/drawable-hdpi/nav_tab_bg.9.png
deleted file mode 100644
index 72ae85b..0000000
--- a/res/drawable-hdpi/nav_tab_bg.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/progress.9.png b/res/drawable-hdpi/progress.9.png
deleted file mode 100644
index da3ce0a..0000000
--- a/res/drawable-hdpi/progress.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/qc_background_normal.png b/res/drawable-hdpi/qc_background_normal.png
deleted file mode 100644
index 8a8e2dc..0000000
--- a/res/drawable-hdpi/qc_background_normal.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
deleted file mode 100644
index dd223c7..0000000
--- a/res/drawable-hdpi/textfield_active_holo_dark.9.png
+++ /dev/null
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
deleted file mode 100644
index 7ea6c26..0000000
--- a/res/drawable-hdpi/textfield_default_holo_dark.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/browsertab_inactive.png b/res/drawable-mdpi/browsertab_inactive.png
deleted file mode 100644
index 1db22a5..0000000
--- a/res/drawable-mdpi/browsertab_inactive.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/deco_progress_bar.9.png b/res/drawable-mdpi/deco_progress_bar.9.png
new file mode 100644
index 0000000..4eb5f51
--- /dev/null
+++ b/res/drawable-mdpi/deco_progress_bar.9.png
Binary files differ
diff --git a/res/drawable-mdpi/geolocation_permissions_prompt_background.9.png b/res/drawable-mdpi/geolocation_permissions_prompt_background.9.png
deleted file mode 100644
index 1604a3d..0000000
--- a/res/drawable-mdpi/geolocation_permissions_prompt_background.9.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
deleted file mode 100644
index aca4345..0000000
--- a/res/drawable-mdpi/ic_back_disabled_holo_dark.png
+++ /dev/null
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
deleted file mode 100644
index 13d20ce..0000000
--- a/res/drawable-mdpi/ic_back_hierarchy_holo_dark.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_back_holo_dark.png b/res/drawable-mdpi/ic_back_holo_dark.png
deleted file mode 100644
index 8977423..0000000
--- a/res/drawable-mdpi/ic_back_holo_dark.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
deleted file mode 100644
index 682c0a5..0000000
--- a/res/drawable-mdpi/ic_close_window_holo_dark.png
+++ /dev/null
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
deleted file mode 100644
index 5cd3f7f..0000000
--- a/res/drawable-mdpi/ic_forward_disabled_holo_dark.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_forward_holo_dark.png b/res/drawable-mdpi/ic_forward_holo_dark.png
deleted file mode 100644
index 7f60012..0000000
--- a/res/drawable-mdpi/ic_forward_holo_dark.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_gps_denied_holo_dark.png b/res/drawable-mdpi/ic_gps_denied_holo_dark.png
deleted file mode 100644
index 3a48b47..0000000
--- a/res/drawable-mdpi/ic_gps_denied_holo_dark.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_gps_on_holo_dark.png b/res/drawable-mdpi/ic_gps_on_holo_dark.png
deleted file mode 100644
index 505e29a..0000000
--- a/res/drawable-mdpi/ic_gps_on_holo_dark.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_menu_forward.png b/res/drawable-mdpi/ic_menu_forward.png
deleted file mode 100644
index 4a0b6ef..0000000
--- a/res/drawable-mdpi/ic_menu_forward.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_menu_moreoverflow_normal_holo_dark.png b/res/drawable-mdpi/ic_menu_moreoverflow_normal_holo_dark.png
deleted file mode 100644
index ba704b6..0000000
--- a/res/drawable-mdpi/ic_menu_moreoverflow_normal_holo_dark.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_menu_overflow.png b/res/drawable-mdpi/ic_menu_overflow.png
deleted file mode 100644
index 4a3bde3..0000000
--- a/res/drawable-mdpi/ic_menu_overflow.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_menu_refresh.png b/res/drawable-mdpi/ic_menu_refresh.png
deleted file mode 100644
index 30b660f..0000000
--- a/res/drawable-mdpi/ic_menu_refresh.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_menu_stop.png b/res/drawable-mdpi/ic_menu_stop.png
deleted file mode 100644
index efb4036..0000000
--- a/res/drawable-mdpi/ic_menu_stop.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_new_incognito_holo_dark.png b/res/drawable-mdpi/ic_new_incognito_holo_dark.png
deleted file mode 100644
index e8a7f49..0000000
--- a/res/drawable-mdpi/ic_new_incognito_holo_dark.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_refresh_holo_dark.png b/res/drawable-mdpi/ic_refresh_holo_dark.png
deleted file mode 100644
index d015979..0000000
--- a/res/drawable-mdpi/ic_refresh_holo_dark.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_search_category_bookmark.png b/res/drawable-mdpi/ic_search_category_bookmark.png
deleted file mode 100644
index cdf4be1..0000000
--- a/res/drawable-mdpi/ic_search_category_bookmark.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_search_category_browser.png b/res/drawable-mdpi/ic_search_category_browser.png
deleted file mode 100644
index 455e640..0000000
--- a/res/drawable-mdpi/ic_search_category_browser.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_search_category_history.png b/res/drawable-mdpi/ic_search_category_history.png
deleted file mode 100644
index 0f63144..0000000
--- a/res/drawable-mdpi/ic_search_category_history.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_search_category_suggest.png b/res/drawable-mdpi/ic_search_category_suggest.png
deleted file mode 100644
index 0f04fc4..0000000
--- a/res/drawable-mdpi/ic_search_category_suggest.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_search_holo_dark.png b/res/drawable-mdpi/ic_search_holo_dark.png
deleted file mode 100644
index 3a991cb..0000000
--- a/res/drawable-mdpi/ic_search_holo_dark.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_share_holo_dark.png b/res/drawable-mdpi/ic_share_holo_dark.png
deleted file mode 100644
index d02cbad..0000000
--- a/res/drawable-mdpi/ic_share_holo_dark.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_stop_holo_dark.png b/res/drawable-mdpi/ic_stop_holo_dark.png
deleted file mode 100644
index 682c0a5..0000000
--- a/res/drawable-mdpi/ic_stop_holo_dark.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_windows_holo_dark.png b/res/drawable-mdpi/ic_windows_holo_dark.png
deleted file mode 100644
index 4d1d3eb..0000000
--- a/res/drawable-mdpi/ic_windows_holo_dark.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/list_selector_pressed_holo_dark.9.png b/res/drawable-mdpi/list_selector_pressed_holo_dark.9.png
deleted file mode 100644
index bf36a43..0000000
--- a/res/drawable-mdpi/list_selector_pressed_holo_dark.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/magnifying_glass.png b/res/drawable-mdpi/magnifying_glass.png
deleted file mode 100644
index bdb48ee..0000000
--- a/res/drawable-mdpi/magnifying_glass.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/nav_tab_bg.9.png b/res/drawable-mdpi/nav_tab_bg.9.png
deleted file mode 100644
index 717a8cf..0000000
--- a/res/drawable-mdpi/nav_tab_bg.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/progress.9.png b/res/drawable-mdpi/progress.9.png
deleted file mode 100644
index 9ccee66..0000000
--- a/res/drawable-mdpi/progress.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/qc_background_normal.png b/res/drawable-mdpi/qc_background_normal.png
deleted file mode 100644
index 9f5f6c9..0000000
--- a/res/drawable-mdpi/qc_background_normal.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/textfield_active_holo_dark.9.png b/res/drawable-mdpi/textfield_active_holo_dark.9.png
deleted file mode 100644
index 296760d..0000000
--- a/res/drawable-mdpi/textfield_active_holo_dark.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/textfield_default_holo_dark.9.png b/res/drawable-mdpi/textfield_default_holo_dark.9.png
deleted file mode 100644
index eb88c4d..0000000
--- a/res/drawable-mdpi/textfield_default_holo_dark.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-nodpi/bg_browsertabs.png b/res/drawable-nodpi/bg_browsertabs.png
deleted file mode 100644
index 8a517f7..0000000
--- a/res/drawable-nodpi/bg_browsertabs.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-nodpi/bg_urlbar.png b/res/drawable-nodpi/bg_urlbar.png
deleted file mode 100644
index 325aad7..0000000
--- a/res/drawable-nodpi/bg_urlbar.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-nodpi/browser_background_holo.png b/res/drawable-nodpi/browser_background_holo.png
deleted file mode 100644
index 62ee0ef..0000000
--- a/res/drawable-nodpi/browser_background_holo.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-sw600dp-nodpi/bg_urlbar.png b/res/drawable-sw600dp-nodpi/bg_urlbar.png
deleted file mode 100644
index 51e95e0..0000000
--- a/res/drawable-sw600dp-nodpi/bg_urlbar.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/browsertab_inactive.png b/res/drawable-xhdpi/browsertab_inactive.png
deleted file mode 100644
index 28eeed4..0000000
--- a/res/drawable-xhdpi/browsertab_inactive.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/deco_cosmetic_topshadow.9.png b/res/drawable-xhdpi/deco_cosmetic_topshadow.9.png
new file mode 100644
index 0000000..f5516d9
--- /dev/null
+++ b/res/drawable-xhdpi/deco_cosmetic_topshadow.9.png
Binary files differ
diff --git a/res/drawable-xhdpi/deco_progress_bar.9.png b/res/drawable-xhdpi/deco_progress_bar.9.png
new file mode 100644
index 0000000..1206ab2
--- /dev/null
+++ b/res/drawable-xhdpi/deco_progress_bar.9.png
Binary files differ
diff --git a/res/drawable-xhdpi/geolocation_permissions_prompt_background.9.png b/res/drawable-xhdpi/geolocation_permissions_prompt_background.9.png
deleted file mode 100644
index 19a35a3..0000000
--- a/res/drawable-xhdpi/geolocation_permissions_prompt_background.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_back_disabled_holo_dark.png b/res/drawable-xhdpi/ic_back_disabled_holo_dark.png
deleted file mode 100644
index 9f99c00..0000000
--- a/res/drawable-xhdpi/ic_back_disabled_holo_dark.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_back_hierarchy_holo_dark.png b/res/drawable-xhdpi/ic_back_hierarchy_holo_dark.png
deleted file mode 100644
index e459b98..0000000
--- a/res/drawable-xhdpi/ic_back_hierarchy_holo_dark.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_back_holo_dark.png b/res/drawable-xhdpi/ic_back_holo_dark.png
deleted file mode 100644
index f79f20a..0000000
--- a/res/drawable-xhdpi/ic_back_holo_dark.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_close_window_holo_dark.png b/res/drawable-xhdpi/ic_close_window_holo_dark.png
deleted file mode 100644
index da31f98..0000000
--- a/res/drawable-xhdpi/ic_close_window_holo_dark.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_forward_disabled_holo_dark.png b/res/drawable-xhdpi/ic_forward_disabled_holo_dark.png
deleted file mode 100644
index bbe6571..0000000
--- a/res/drawable-xhdpi/ic_forward_disabled_holo_dark.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_forward_holo_dark.png b/res/drawable-xhdpi/ic_forward_holo_dark.png
deleted file mode 100644
index c0e8371..0000000
--- a/res/drawable-xhdpi/ic_forward_holo_dark.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_gps_denied_holo_dark.png b/res/drawable-xhdpi/ic_gps_denied_holo_dark.png
deleted file mode 100644
index a695cda..0000000
--- a/res/drawable-xhdpi/ic_gps_denied_holo_dark.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_gps_on_holo_dark.png b/res/drawable-xhdpi/ic_gps_on_holo_dark.png
deleted file mode 100644
index 38c1892..0000000
--- a/res/drawable-xhdpi/ic_gps_on_holo_dark.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_menu_forward.png b/res/drawable-xhdpi/ic_menu_forward.png
deleted file mode 100644
index 6463e7a..0000000
--- a/res/drawable-xhdpi/ic_menu_forward.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_menu_moreoverflow_normal_holo_dark.png b/res/drawable-xhdpi/ic_menu_moreoverflow_normal_holo_dark.png
deleted file mode 100644
index a92fb1d..0000000
--- a/res/drawable-xhdpi/ic_menu_moreoverflow_normal_holo_dark.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_menu_overflow.png b/res/drawable-xhdpi/ic_menu_overflow.png
deleted file mode 100644
index 715cff8..0000000
--- a/res/drawable-xhdpi/ic_menu_overflow.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_menu_refresh.png b/res/drawable-xhdpi/ic_menu_refresh.png
deleted file mode 100644
index 9e9f10e..0000000
--- a/res/drawable-xhdpi/ic_menu_refresh.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_menu_stop.png b/res/drawable-xhdpi/ic_menu_stop.png
deleted file mode 100644
index 855af11..0000000
--- a/res/drawable-xhdpi/ic_menu_stop.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_new_incognito_holo_dark.png b/res/drawable-xhdpi/ic_new_incognito_holo_dark.png
deleted file mode 100644
index 2f21240..0000000
--- a/res/drawable-xhdpi/ic_new_incognito_holo_dark.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_refresh_holo_dark.png b/res/drawable-xhdpi/ic_refresh_holo_dark.png
deleted file mode 100644
index efdf884..0000000
--- a/res/drawable-xhdpi/ic_refresh_holo_dark.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_search_category_bookmark.png b/res/drawable-xhdpi/ic_search_category_bookmark.png
deleted file mode 100644
index 6046a95..0000000
--- a/res/drawable-xhdpi/ic_search_category_bookmark.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_search_category_browser.png b/res/drawable-xhdpi/ic_search_category_browser.png
deleted file mode 100644
index bb767b4..0000000
--- a/res/drawable-xhdpi/ic_search_category_browser.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_search_category_history.png b/res/drawable-xhdpi/ic_search_category_history.png
deleted file mode 100644
index 681e4b4..0000000
--- a/res/drawable-xhdpi/ic_search_category_history.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_search_category_suggest.png b/res/drawable-xhdpi/ic_search_category_suggest.png
deleted file mode 100644
index be0388c..0000000
--- a/res/drawable-xhdpi/ic_search_category_suggest.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_search_holo_dark.png b/res/drawable-xhdpi/ic_search_holo_dark.png
deleted file mode 100644
index fbc62cf..0000000
--- a/res/drawable-xhdpi/ic_search_holo_dark.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_share_holo_dark.png b/res/drawable-xhdpi/ic_share_holo_dark.png
deleted file mode 100644
index 5c3047a..0000000
--- a/res/drawable-xhdpi/ic_share_holo_dark.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_stop_holo_dark.png b/res/drawable-xhdpi/ic_stop_holo_dark.png
deleted file mode 100644
index da31f98..0000000
--- a/res/drawable-xhdpi/ic_stop_holo_dark.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_windows_holo_dark.png b/res/drawable-xhdpi/ic_windows_holo_dark.png
deleted file mode 100644
index c7411b7..0000000
--- a/res/drawable-xhdpi/ic_windows_holo_dark.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/list_selector_pressed_holo_dark.9.png b/res/drawable-xhdpi/list_selector_pressed_holo_dark.9.png
deleted file mode 100644
index df19701..0000000
--- a/res/drawable-xhdpi/list_selector_pressed_holo_dark.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/magnifying_glass.png b/res/drawable-xhdpi/magnifying_glass.png
deleted file mode 100644
index 62742b7..0000000
--- a/res/drawable-xhdpi/magnifying_glass.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/nav_tab_bg.9.png b/res/drawable-xhdpi/nav_tab_bg.9.png
deleted file mode 100644
index d81bbca..0000000
--- a/res/drawable-xhdpi/nav_tab_bg.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/progress.9.png b/res/drawable-xhdpi/progress.9.png
deleted file mode 100644
index f6f8d8d..0000000
--- a/res/drawable-xhdpi/progress.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/qc_background_normal.png b/res/drawable-xhdpi/qc_background_normal.png
deleted file mode 100644
index bea09ca..0000000
--- a/res/drawable-xhdpi/qc_background_normal.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/textfield_active_holo_dark.9.png b/res/drawable-xhdpi/textfield_active_holo_dark.9.png
deleted file mode 100644
index 97687e5..0000000
--- a/res/drawable-xhdpi/textfield_active_holo_dark.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/textfield_default_holo_dark.9.png b/res/drawable-xhdpi/textfield_default_holo_dark.9.png
deleted file mode 100644
index c3e59fc..0000000
--- a/res/drawable-xhdpi/textfield_default_holo_dark.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxhdpi/deco_cosmetic_topshadow.9.png b/res/drawable-xxhdpi/deco_cosmetic_topshadow.9.png
new file mode 100644
index 0000000..4873a53
--- /dev/null
+++ b/res/drawable-xxhdpi/deco_cosmetic_topshadow.9.png
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_action_gps_off.png b/res/drawable-xxhdpi/ic_action_gps_off.png
new file mode 100644
index 0000000..ea88d56
--- /dev/null
+++ 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
new file mode 100644
index 0000000..1c2d93c
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_action_gps_on.png
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_action_overflow_active.png b/res/drawable-xxhdpi/ic_action_overflow_active.png
new file mode 100644
index 0000000..6de9030
--- /dev/null
+++ 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
new file mode 100644
index 0000000..b400f31
--- /dev/null
+++ 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
new file mode 100644
index 0000000..3fcf285
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_action_overflow_normal.png
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_action_search_normal.png b/res/drawable-xxhdpi/ic_action_search_normal.png
new file mode 100644
index 0000000..1525102
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_action_search_normal.png
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_action_tabswitcher_active.png b/res/drawable-xxhdpi/ic_action_tabswitcher_active.png
new file mode 100644
index 0000000..d594918
--- /dev/null
+++ 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
new file mode 100644
index 0000000..e1f611b
--- /dev/null
+++ 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
new file mode 100644
index 0000000..a2e3aaa
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_action_tabswitcher_normal.png
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_suggest_bookmark_normal.png b/res/drawable-xxhdpi/ic_suggest_bookmark_normal.png
new file mode 100644
index 0000000..d1e6fae
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_suggest_bookmark_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
new file mode 100644
index 0000000..b433694
--- /dev/null
+++ 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
new file mode 100644
index 0000000..fda1241
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_suggest_history_normal.png
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_suggest_search_normal.png b/res/drawable-xxhdpi/ic_suggest_search_normal.png
new file mode 100644
index 0000000..1525102
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_suggest_search_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
new file mode 100644
index 0000000..744d6d4
--- /dev/null
+++ b/res/drawable-xxhdpi/nav_tab_title.9.png
Binary files differ
diff --git a/res/drawable/ic_action_overflow.xml b/res/drawable/ic_action_overflow.xml
new file mode 100644
index 0000000..4b03943
--- /dev/null
+++ b/res/drawable/ic_action_overflow.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_overflow_active" />
+
+ <item android:state_enabled="true" android:state_selected="true"
+ android:drawable="@drawable/ic_action_overflow_active" />
+
+ <item android:state_enabled="false"
+ android:drawable="@drawable/ic_action_overflow_disabled" />
+
+ <item android:drawable="@drawable/ic_action_overflow_normal" />
+
+</selector>
diff --git a/res/drawable/ic_action_tabswitcher.xml b/res/drawable/ic_action_tabswitcher.xml
new file mode 100644
index 0000000..bc927a6
--- /dev/null
+++ b/res/drawable/ic_action_tabswitcher.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_tabswitcher_active" />
+
+ <item android:state_enabled="true" android:state_selected="true"
+ android:drawable="@drawable/ic_action_tabswitcher_active" />
+
+ <item android:state_enabled="false"
+ android:drawable="@drawable/ic_action_tabswitcher_disabled" />
+
+ <item android:drawable="@drawable/ic_action_tabswitcher_normal" />
+
+</selector>
diff --git a/res/drawable/url_background.xml b/res/drawable/url_background.xml
deleted file mode 100644
index f719c29..0000000
--- a/res/drawable/url_background.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?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">
- <item
- android:state_focused="true"
- android:drawable="@drawable/textfield_active_holo_dark" />
- <item
- android:state_focused="false"
- android:drawable="@drawable/textfield_default_holo_dark" />
-</selector>
\ No newline at end of file
diff --git a/res/layout-land/nav_screen.xml b/res/layout-land/nav_screen.xml
deleted file mode 100644
index fdadd6a..0000000
--- a/res/layout-land/nav_screen.xml
+++ /dev/null
@@ -1,61 +0,0 @@
-<?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.
--->
-
-<RelativeLayout
- xmlns:android="http://schemas.android.com/apk/res/android"
- android:id="@+id/nav_screen"
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:background="@drawable/browser_background_holo">
- <com.android.browser.NavTabScroller
- android:id="@+id/scroller"
- android:layout_width="match_parent"
- android:layout_height="match_parent" />
- <LinearLayout
- android:id="@+id/tabbar"
- android:orientation="horizontal"
- android:layout_width="match_parent"
- android:layout_height="@dimen/toolbar_height"
- android:layout_gravity="top"
- android:gravity="right"
- android:background="#CC0d0d0d">
- <ImageButton
- android:id="@+id/newtab"
- android:layout_width="wrap_content"
- android:layout_height="match_parent"
- style="@style/HoloButton"
- android:gravity="center_vertical"
- android:contentDescription="@string/accessibility_button_newtab"
- android:src="@drawable/ic_new_window_holo_dark" />
- <ImageButton
- android:id="@+id/bookmarks"
- android:layout_width="wrap_content"
- android:layout_height="match_parent"
- android:contentDescription="@string/accessibility_button_bookmarks"
- android:src="@drawable/ic_bookmarks_history_holo_dark"
- style="@style/HoloButton" />
- <ImageButton
- android:id="@+id/more"
- android:layout_width="wrap_content"
- android:layout_height="match_parent"
- android:paddingLeft="8dip"
- android:paddingRight="8dip"
- style="@style/HoloButton"
- android:gravity="center_vertical"
- android:contentDescription="@string/accessibility_button_more"
- android:src="@drawable/ic_menu_overflow" />
- </LinearLayout>
-</RelativeLayout>
diff --git a/res/layout-sw600dp/title_bar_nav.xml b/res/layout-sw600dp/title_bar_nav.xml
index e6abe7c..3ec3192 100644
--- a/res/layout-sw600dp/title_bar_nav.xml
+++ b/res/layout-sw600dp/title_bar_nav.xml
@@ -14,119 +14,127 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<com.android.browser.NavigationBarTablet
- xmlns:android="http://schemas.android.com/apk/res/android"
- android:orientation="horizontal"
- android:background="@drawable/bg_urlbar">
+<com.android.browser.NavigationBarTablet xmlns:android="http://schemas.android.com/apk/res/android"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:background="@color/NavigationBarBackground"
+ android:orientation="horizontal">
+
<LinearLayout
android:id="@+id/navbuttons"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:orientation="horizontal">
+
<ImageButton
android:id="@+id/back"
- android:src="@drawable/ic_back_holo_dark"
+ style="@style/NavButton"
android:layout_width="wrap_content"
- android:layout_height="match_parent"
android:contentDescription="@string/accessibility_button_back"
- style="@style/HoloButton" />
+ android:src="@drawable/ic_action_history_backward" />
+
<ImageButton
android:id="@+id/forward"
- android:src="@drawable/ic_forward_holo_dark"
+ style="@style/NavButton"
android:layout_width="wrap_content"
- android:layout_height="match_parent"
android:contentDescription="@string/accessibility_button_forward"
- style="@style/HoloButton" />
+ android:src="@drawable/ic_action_history_forward" />
+
+ <!-- Stop/Refresh button -->
<ImageButton
android:id="@+id/stop"
+ style="@style/NavButton"
android:layout_width="wrap_content"
- android:layout_height="match_parent"
- style="@style/HoloButton"
- android:gravity="center_vertical"
android:contentDescription="@string/accessibility_button_stop"
- android:src="@drawable/ic_stop_holo_dark" />
+ android:gravity="center_vertical" />
</LinearLayout>
+
<LinearLayout
android:id="@+id/urlbar_focused"
android:layout_width="0dip"
android:layout_height="match_parent"
android:layout_weight="1.0"
- android:orientation="horizontal"
- android:background="@drawable/url_background">
+ android:orientation="horizontal">
+
<com.android.browser.LocationButton
android:id="@+id/location_button"
- android:layout_width="32dip"
- android:layout_height="20dip"
- android:visibility="gone"
- style="@style/HoloButton"
- android:layout_gravity="center" />
+ style="@style/NavButton"
+ android:layout_width="48dp"
+ android:visibility="gone" />
+
<ImageView
android:id="@+id/url_icon"
android:layout_width="32dip"
android:layout_height="20dip"
- android:src="@drawable/ic_web_holo_dark"
- android:layout_gravity="center" />
+ android:layout_gravity="center"
+ android:src="@drawable/ic_web_holo_dark" />
+
<ImageView
android:id="@+id/lock"
+ style="@style/HoloIcon"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:layout_marginLeft="0dip"
- style="@style/HoloIcon"
android:visibility="gone" />
+
<com.android.browser.UrlInputView
android:id="@+id/url"
+ style="@style/Suggestions"
android:layout_width="0dip"
- android:layout_weight="1.0"
android:layout_height="match_parent"
+ android:layout_weight="1.0"
+ android:background="@null"
+ android:ellipsize="end"
+ android:hint="@string/search_hint"
+ android:imeOptions="actionGo|flagNoExtractUi|flagNoFullscreen"
+ android:inputType="textUri"
+ android:lines="1"
android:paddingLeft="4dip"
android:paddingRight="0dip"
- android:background="@null"
- android:textAppearance="?android:attr/textAppearanceMedium"
- android:hint="@string/search_hint"
- android:singleLine="true"
- android:ellipsize="end"
- android:lines="1"
android:scrollHorizontally="true"
- android:inputType="textUri"
- android:imeOptions="actionGo|flagNoExtractUi|flagNoFullscreen"
- style="@style/Suggestions" />
+ android:singleLine="true"
+ android:textAppearance="?android:attr/textAppearanceMedium" />
+
<ImageButton
android:id="@+id/star"
- android:src="@drawable/btn_imageview_star"
+ style="@style/NavButton"
android:layout_width="wrap_content"
- android:layout_height="match_parent"
android:contentDescription="@string/accessibility_button_addbookmark"
- style="@style/HoloButton" />
+ android:src="@drawable/ic_action_bookmark" />
+
<ImageButton
android:id="@+id/clear"
- android:src="@drawable/ic_stop_holo_dark"
+ style="@style/NavButton"
android:layout_width="wrap_content"
- android:layout_height="match_parent"
android:contentDescription="@string/accessibility_button_clear"
- style="@style/HoloButton" />
+ android:src="@drawable/ic_action_stop" />
+
<ImageButton
android:id="@+id/voice"
- android:src="@drawable/ic_voice_search_holo_dark"
+ style="@style/NavButton"
android:layout_width="wrap_content"
- android:layout_height="match_parent"
android:contentDescription="@string/accessibility_button_voice"
- style="@style/HoloButton" />
- </LinearLayout>
+ android:src="@drawable/ic_voice_search_holo_dark" />
+ </LinearLayout>
+
<ImageButton
android:id="@+id/search"
- android:src="@drawable/ic_search_holo_dark"
+ style="@style/NavButton"
android:layout_width="wrap_content"
- android:layout_height="match_parent"
+ android:contentDescription="@string/accessibility_button_search"
android:gravity="center_vertical"
- android:contentDescription="@string/accessibility_button_search"
- style="@style/HoloButton" />
+ android:src="@drawable/ic_action_search_normal" />
+
<ImageButton
android:id="@+id/all_btn"
+ style="@style/NavButton"
android:layout_width="wrap_content"
- android:layout_height="match_parent"
- android:scaleType="center"
- style="@style/HoloButton"
android:contentDescription="@string/accessibility_button_bookmarks"
+ android:scaleType="center"
android:src="@drawable/ic_bookmarks_history_holo_dark" />
+
+ <ImageButton
+ android:id="@+id/more_browser_settings"
+ style="@style/OverflowButton" />
</com.android.browser.NavigationBarTablet>
diff --git a/res/layout-sw600dp/title_bar_snapshot.xml b/res/layout-sw600dp/title_bar_snapshot.xml
index 72e4b2b..f2abd5c 100644
--- a/res/layout-sw600dp/title_bar_snapshot.xml
+++ b/res/layout-sw600dp/title_bar_snapshot.xml
@@ -18,11 +18,10 @@
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:orientation="horizontal"
- android:background="@drawable/bg_urlbar">
+ android:orientation="horizontal" >
<ImageView
android:id="@+id/date_icon"
- android:src="@drawable/ic_search_category_history"
+ android:src="@drawable/ic_suggest_history_normal"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:paddingLeft="16dip" />
@@ -43,13 +42,13 @@
android:singleLine="true"
android:gravity="center_vertical"
android:textAppearance="?android:attr/textAppearanceMedium" />
+
<ImageButton
android:id="@+id/all_btn"
+ style="@style/NavButton"
android:layout_width="wrap_content"
- android:layout_height="match_parent"
- android:scaleType="center"
+ android:contentDescription="@string/accessibility_button_bookmarks"
android:paddingRight="16dip"
- style="@style/HoloButton"
- android:src="@drawable/ic_bookmarks_history_holo_dark"
- android:contentDescription="@string/accessibility_button_bookmarks" />
+ android:scaleType="center"
+ android:src="@drawable/ic_bookmarks_history_holo_dark" />
</com.android.browser.SnapshotBar>
\ No newline at end of file
diff --git a/res/layout/anim_screen.xml b/res/layout/anim_screen.xml
index 0cdc931..9dc91d5 100644
--- a/res/layout/anim_screen.xml
+++ b/res/layout/anim_screen.xml
@@ -14,21 +14,27 @@
limitations under the License.
-->
-<LinearLayout
- xmlns:android="http://schemas.android.com/apk/res/android"
- android:id="@+id/main"
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:orientation="vertical"
- android:focusable="false"
- android:background="@drawable/browser_background_holo">
- <ImageView
- android:id="@+id/title"
+ android:orientation="vertical">
+
+ <!-- obfuscate with the same color as the tabs Nav background -->
+ <View
android:layout_width="match_parent"
- android:layout_height="@dimen/toolbar_height" />
+ android:layout_height="match_parent"
+ android:layout_marginTop="@dimen/toolbar_height"
+ android:background="@color/TabNavBackgroundColor" />
+
+ <!-- the moving preview (manually placed) -->
<ImageView
- android:id="@+id/content"
+ android:id="@+id/anim_screen_content"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="@color/white" />
-</LinearLayout>
+
+ <!-- block the size of the menu (to protect touch during animations) -->
+ <!-- View
+ android:layout_width="match_parent"
+ android:layout_height="@dimen/toolbar_height" / -->
+</FrameLayout>
diff --git a/res/layout/browser_subwindow.xml b/res/layout/browser_subwindow.xml
index fb6fa37..0e8051a 100644
--- a/res/layout/browser_subwindow.xml
+++ b/res/layout/browser_subwindow.xml
@@ -23,15 +23,15 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:background="@color/black"
+ android:background="@color/NavigationBarBackground"
android:layout_gravity="right"
android:gravity="right" >
- <ImageButton android:id="@+id/subwindow_close"
- style="@style/HoloButton"
- android:focusable="true"
+ <ImageButton
+ android:id="@+id/subwindow_close"
+ style="@style/NavButton"
android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:src="@drawable/ic_close_window_holo_dark" />
+ android:focusable="true"
+ android:src="@drawable/ic_action_stop" />
</LinearLayout>
<LinearLayout
android:id="@+id/inner_container"
diff --git a/res/layout/custom_screen.xml b/res/layout/custom_screen.xml
index 61c455c..d166d80 100644
--- a/res/layout/custom_screen.xml
+++ b/res/layout/custom_screen.xml
@@ -18,7 +18,6 @@
xmlns:android="http://schemas.android.com/apk/res/android">
<FrameLayout android:id="@+id/fullscreen_custom_content"
android:visibility="gone"
- android:background="@color/black"
android:layout_width="match_parent"
android:layout_height="match_parent"
/>
diff --git a/res/layout/geolocation_permissions_prompt.xml b/res/layout/geolocation_permissions_prompt.xml
index d63ef84..b42b3f9 100755
--- a/res/layout/geolocation_permissions_prompt.xml
+++ b/res/layout/geolocation_permissions_prompt.xml
@@ -18,43 +18,44 @@
<com.android.browser.GeolocationPermissionsPrompt
xmlns:android="http://schemas.android.com/apk/res/android"
+ android:background="@color/TabPassiveMessageBackground"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:background="@drawable/geolocation_permissions_prompt_background"
- android:visibility="gone">
+ android:orientation="vertical">
+
+ <!-- Cosmetic separator -->
+ <View
+ android:layout_width="match_parent"
+ android:layout_height="1dp"
+ android:background="@color/TabPassiveMessageLine" />
<!-- 'google.com wants to know your location' -->
<TextView android:id="@+id/message"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:singleLine="true"
- android:scrollHorizontally="true"
- android:padding="6dip"
+ android:paddingBottom="4dp"
+ android:paddingLeft="16dp"
+ android:paddingRight="16dp"
+ android:paddingTop="16dp"
android:textAppearance="?android:attr/textAppearanceSmall" />
- <CheckBox android:id="@+id/remember"
- android:layout_width="wrap_content"
+ <CheckBox
+ android:id="@+id/remember"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:layout_below="@id/message"
- android:layout_alignLeft="@id/message" />
- <TextView
- android:paddingLeft="4dip"
+ android:layout_marginLeft="8dp"
+ android:layout_marginRight="8dp"
android:text="@string/geolocation_permissions_prompt_remember"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:textAppearance="?android:attr/textAppearanceSmall"
- android:layout_alignBaseline="@id/remember"
- android:layout_toRightOf="@id/remember" />
+ android:textAppearance="?android:attr/textAppearanceSmall" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:layout_below="@id/remember"
android:orientation="vertical"
android:divider="?android:attr/dividerHorizontal"
android:showDividers="beginning"
- android:dividerPadding="16dip"
- android:background="@null">
+ android:layout_marginTop="8dp"
+ android:dividerPadding="16dip" >
<LinearLayout
style="?android:attr/buttonBarStyle"
android:layout_width="match_parent"
diff --git a/res/layout/menu_item.xml b/res/layout/menu_item.xml
index 7247ee1..cdee2fd 100644
--- a/res/layout/menu_item.xml
+++ b/res/layout/menu_item.xml
@@ -20,8 +20,6 @@
android:layout_gravity="start"
android:gravity="center_vertical"
android:singleLine="true"
- android:paddingLeft="16dp"
- android:paddingEnd="9dp"
/>
<view
class="com.android.browser.appmenu.AppMenuItemIcon"
@@ -37,6 +35,6 @@
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:tint="@color/black"
- android:visible="false"
+ android:visibility="gone"
android:clickable="true" />
</LinearLayout>
diff --git a/res/layout/nav_screen.xml b/res/layout/nav_screen.xml
index c655727..51109f7 100644
--- a/res/layout/nav_screen.xml
+++ b/res/layout/nav_screen.xml
@@ -14,49 +14,58 @@
limitations under the License.
-->
-<RelativeLayout
- xmlns:android="http://schemas.android.com/apk/res/android"
- android:id="@+id/nav_screen"
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:background="@drawable/browser_background_holo">
+ android:background="@color/TabNavBackgroundColor"
+ android:orientation="vertical">
+
<com.android.browser.NavTabScroller
android:id="@+id/scroller"
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:orientation="vertical" />
+ android:orientation="@integer/nav_tab_orientation" />
+
+ <!-- Tabs toolbar -->
<LinearLayout
- android:id="@+id/tabbar"
- android:orientation="horizontal"
android:layout_width="match_parent"
android:layout_height="@dimen/toolbar_height"
- android:layout_gravity="top"
- android:gravity="right"
- android:background="#CC0d0d0d">
- <ImageButton
- android:id="@+id/newtab"
+ android:background="@color/NavigationBarBackground"
+ android:gravity="end"
+ android:orientation="horizontal">
+
+ <!-- animated subset -->
+ <LinearLayout
+ android:id="@+id/nav_toolbar_animate"
android:layout_width="wrap_content"
android:layout_height="match_parent"
- style="@style/HoloButton"
- android:gravity="center_vertical"
- android:contentDescription="@string/accessibility_button_newtab"
- android:src="@drawable/ic_new_window_holo_dark" />
- <ImageButton
- android:id="@+id/bookmarks"
- android:layout_width="wrap_content"
- android:layout_height="match_parent"
- android:contentDescription="@string/accessibility_button_bookmarks"
- android:src="@drawable/ic_bookmarks_history_holo_dark"
- style="@style/HoloButton" />
+ android:orientation="horizontal">
+
+ <ImageButton
+ android:id="@+id/newtab"
+ style="@style/NavButtonWide"
+ android:contentDescription="@string/accessibility_button_newtab"
+ android:gravity="center_vertical"
+ android:src="@drawable/ic_action_add_tab" />
+
+ <ImageButton
+ android:id="@+id/newincognitotab"
+ style="@style/NavButtonWide"
+ android:contentDescription="@string/accessibility_button_newincognitotab"
+ android:gravity="center_vertical"
+ android:src="@drawable/ic_action_add_incognito" />
+ </LinearLayout>
+
<ImageButton
android:id="@+id/more"
- android:layout_width="wrap_content"
- android:layout_height="match_parent"
- android:paddingLeft="8dip"
- android:paddingRight="8dip"
- style="@style/HoloButton"
- android:gravity="center_vertical"
- android:contentDescription="@string/accessibility_button_more"
- android:src="@drawable/ic_menu_overflow" />
+ style="@style/OverflowButton" />
</LinearLayout>
-</RelativeLayout>
+
+ <!-- Cosmetic shadow (covered by anim_screen during transitions) -->
+ <View
+ android:layout_width="match_parent"
+ android:layout_height="8dp"
+ android:layout_marginTop="@dimen/toolbar_height"
+ android:background="@drawable/deco_cosmetic_topshadow" />
+
+</FrameLayout>
\ No newline at end of file
diff --git a/res/layout/nav_tab_view.xml b/res/layout/nav_tab_view.xml
index d1205f0..36e2082 100644
--- a/res/layout/nav_tab_view.xml
+++ b/res/layout/nav_tab_view.xml
@@ -20,7 +20,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="vertical"
- android:background="@drawable/nav_tab_bg"
+ android:background="@drawable/nav_tab_title"
android:focusable="false">
<LinearLayout
android:id="@+id/titlebar"
@@ -41,19 +41,20 @@
android:textAppearance="?android:attr/textAppearanceSmall"
android:scrollHorizontally="true"
android:drawablePadding="8dip" />
+
<ImageView
android:id="@+id/closetab"
- android:src="@drawable/ic_tab_close"
- android:layout_gravity="center_vertical"
+ style="@style/NavButton"
android:layout_width="wrap_content"
- android:layout_height="match_parent"
- android:paddingRight="16dip"
+ android:layout_gravity="center_vertical"
android:contentDescription="@string/accessibility_button_closetab"
- style="@style/HoloButton" />
+ android:paddingRight="16dip"
+ android:src="@drawable/ic_action_stop" />
</LinearLayout>
+
+ <!-- Preview Image -->
<ImageView
android:id="@+id/tab_view"
- android:src="@drawable/ic_stop_holo_dark"
android:layout_width="@dimen/nav_tab_width"
android:layout_height="@dimen/nav_tab_height"
android:paddingLeft="2dip"
diff --git a/res/layout/one_button_plus_menu_item.xml b/res/layout/one_button_plus_menu_item.xml
index 278611c..29eaf57 100644
--- a/res/layout/one_button_plus_menu_item.xml
+++ b/res/layout/one_button_plus_menu_item.xml
@@ -21,11 +21,6 @@
<ImageButton
android:id="@+id/button_two"
- android:layout_width="0dp"
- android:layout_height="match_parent"
- android:layout_weight="6"
- android:background="?android:attr/listChoiceBackgroundIndicator"
- android:scaleType="center"
- />
+ style="@style/OverflowButton" />
</LinearLayout>
\ No newline at end of file
diff --git a/res/layout/tab_bar.xml b/res/layout/tab_bar.xml
index a9a70fd..bbb22a5 100644
--- a/res/layout/tab_bar.xml
+++ b/res/layout/tab_bar.xml
@@ -10,24 +10,23 @@
the specific language governing permissions and limitations under the
License.
-->
-<merge
- xmlns:android="http://schemas.android.com/apk/res/android"
+<merge xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/tabbarcontent"
android:layout_width="match_parent"
android:layout_height="?android:attr/actionBarSize"
- android:orientation="horizontal"
- >
+ android:orientation="horizontal">
+
<com.android.browser.TabScrollView
android:id="@+id/tabs"
android:layout_width="0dip"
android:layout_height="match_parent"
android:layout_weight="1.0"
android:orientation="horizontal" />
+
<ImageButton
android:id="@+id/newtab"
- android:src="@drawable/ic_menu_new_window"
+ style="@style/NavButton"
android:layout_width="wrap_content"
- android:layout_height="match_parent"
- style="@style/HoloButton"
- android:background="@drawable/add_tab_selector" />
+ android:background="@drawable/add_tab_selector"
+ android:src="@drawable/ic_menu_new_window" />
</merge>
diff --git a/res/layout/tab_title.xml b/res/layout/tab_title.xml
index 8a5e308..57251d9 100644
--- a/res/layout/tab_title.xml
+++ b/res/layout/tab_title.xml
@@ -29,7 +29,7 @@
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:gravity="center_vertical"
- android:src="@drawable/ic_search_category_history"
+ android:src="@drawable/ic_suggest_history_normal"
android:contentDescription="@string/accessibility_state_frozen"
android:visibility="gone" />
<ImageView
diff --git a/res/layout/three_button_plus_menu_item.xml b/res/layout/three_button_plus_menu_item.xml
index e0cc23b..631690d 100644
--- a/res/layout/three_button_plus_menu_item.xml
+++ b/res/layout/three_button_plus_menu_item.xml
@@ -45,12 +45,5 @@
<ImageButton
android:id="@+id/button_four"
- android:layout_width="0dp"
- android:layout_height="match_parent"
- android:layout_weight="6"
- android:paddingStart="11dp"
- android:paddingEnd="11dp"
- android:background="?android:attr/listChoiceBackgroundIndicator"
- android:scaleType="center"
- android:tint="@color/black" />
+ style="@style/OverflowButton" />
</LinearLayout>
\ No newline at end of file
diff --git a/res/layout/title_bar.xml b/res/layout/title_bar.xml
index 7771c59..d972dd7 100644
--- a/res/layout/title_bar.xml
+++ b/res/layout/title_bar.xml
@@ -22,23 +22,39 @@
android:focusableInTouchMode="true"
android:layout_width="match_parent"
android:layout_height="wrap_content">
- <include
- layout="@layout/title_bar_nav"
- android:id="@+id/taburlbar"
+
+ <FrameLayout
android:layout_width="match_parent"
- android:layout_height="@dimen/toolbar_height" />
- <ViewStub
- android:id="@+id/snapshotbar_stub"
- android:layout="@layout/title_bar_snapshot"
- android:layout_width="match_parent"
- android:layout_height="@dimen/toolbar_height" />
+ android:layout_height="@dimen/toolbar_height">
+
+ <include
+ layout="@layout/title_bar_nav"
+ android:id="@+id/taburlbar"
+ android:layout_width="match_parent"
+ android:layout_height="@dimen/toolbar_height" />
+
+ <ViewStub
+ android:id="@+id/snapshotbar_stub"
+ android:layout="@layout/title_bar_snapshot"
+ android:layout_width="match_parent"
+ android:layout_height="@dimen/toolbar_height" />
+
+ <!-- Cosmetic separator -->
+ <View
+ android:layout_width="match_parent"
+ android:layout_height="1dp"
+ android:layout_gravity="bottom"
+ android:background="@color/NavigationBarUnderline" />
+ </FrameLayout>
+
+ <!-- the main Progress view -->
<com.android.browser.PageProgressView
android:id="@+id/progress"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@null"
android:layout_gravity="bottom"
- android:src="@drawable/progress"
+ android:src="@drawable/deco_progress_bar"
android:layout_marginTop="@dimen/progress_bar_margin"
android:visibility="gone" />
</LinearLayout>
diff --git a/res/layout/title_bar_nav.xml b/res/layout/title_bar_nav.xml
index 3ee99fd..b9952f1 100644
--- a/res/layout/title_bar_nav.xml
+++ b/res/layout/title_bar_nav.xml
@@ -14,53 +14,55 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<com.android.browser.NavigationBarPhone
- xmlns:android="http://schemas.android.com/apk/res/android"
- android:orientation="horizontal"
- android:background="@drawable/bg_urlbar">
+<com.android.browser.NavigationBarPhone xmlns:android="http://schemas.android.com/apk/res/android"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:background="@color/NavigationBarBackground"
+ android:orientation="horizontal">
+
<LinearLayout
- android:id="@+id/title_bg"
android:layout_width="0dip"
- android:layout_weight="1.0"
android:layout_height="match_parent"
+ android:layout_weight="1.0"
android:gravity="center_vertical"
- android:layout_marginLeft="8dip"
- android:layout_marginRight="8dip"
android:orientation="horizontal">
- <ImageView
- android:id="@+id/magnify"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:paddingLeft="4dip"
- android:paddingRight="8dip"
- android:visibility="gone"
- android:src="@drawable/ic_search_category_suggest" />
+
<ImageView
android:id="@+id/incognito_icon"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:paddingLeft="4dip"
- android:visibility="gone"
- android:src="@drawable/ic_incognito_holo_dark" />
+ android:layout_width="48dp"
+ android:layout_height="match_parent"
+ android:src="@drawable/ic_incognito_holo_dark"
+ android:visibility="gone" />
+
<com.android.browser.LocationButton
android:id="@+id/location_button"
- android:layout_width="32dip"
- android:layout_height="32dip"
- android:visibility="gone"
- style="@style/HoloButton"/>
+ style="@style/NavButton"
+ android:layout_width="wrap_content"
+ android:visibility="gone" />
+
+ <ImageView
+ android:id="@+id/magnify"
+ android:layout_width="44dp"
+ android:layout_height="match_parent"
+ android:src="@drawable/ic_action_search_normal"
+ android:paddingLeft="6dp"
+ android:paddingRight="6dp"
+ android:visibility="visible" />
+
<FrameLayout
android:id="@+id/iconcombo"
+ style="@style/NavButton"
android:layout_width="44dip"
- android:layout_height="match_parent"
- android:contentDescription="@string/page_info"
- style="@style/HoloButton">
+ android:contentDescription="@string/page_info">
+
<ImageView
android:id="@+id/favicon"
android:layout_width="32dip"
android:layout_height="32dip"
- android:paddingLeft="4dip"
- android:paddingRight="8dip"
- android:layout_gravity="center" />
+ android:layout_gravity="center"
+ android:paddingLeft="6dip"
+ android:paddingRight="6dip" />
+
<ImageView
android:id="@+id/lock"
android:layout_width="32dip"
@@ -68,65 +70,80 @@
android:layout_gravity="center"
android:visibility="gone" />
</FrameLayout>
+
<ImageView
android:id="@+id/stop"
+ style="@style/NavButton"
android:layout_width="wrap_content"
- android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
- android:paddingLeft="4dip"
android:contentDescription="@string/accessibility_button_stop"
- android:src="@drawable/ic_stop_holo_dark"
- style="@style/HoloButton" />
+ android:paddingLeft="6dp"
+ android:paddingRight="6dp"
+ android:src="@drawable/ic_action_stop" />
+
<com.android.browser.UrlInputView
android:id="@+id/url"
- android:focusable="true"
+ style="@style/Suggestions"
android:layout_width="0dip"
- android:layout_weight="1.0"
android:layout_height="match_parent"
+ android:layout_weight="1.0"
+ android:background="@null"
+ android:ellipsize="end"
android:fadingEdge="horizontal"
android:fadingEdgeLength="24dip"
- android:textAppearance="?android:attr/textAppearanceMedium"
+ android:focusable="true"
android:hint="@string/search_hint"
- android:singleLine="true"
- android:ellipsize="end"
- android:lines="1"
- android:scrollHorizontally="true"
- android:inputType="textUri"
android:imeOptions="actionGo|flagNoExtractUi|flagNoFullscreen"
- style="@style/Suggestions"
- android:background="@null" />
+ android:inputType="textUri"
+ android:lines="1"
+ android:paddingLeft="4dp"
+ android:paddingRight="6dp"
+ android:scrollHorizontally="true"
+ android:singleLine="true"
+ android:textAppearance="?android:attr/textAppearanceMedium" />
+
<ImageView
android:id="@+id/voice"
+ style="@style/NavButton"
android:layout_width="wrap_content"
- android:layout_height="match_parent"
- android:paddingRight="4dip"
android:contentDescription="@string/accessibility_button_voice"
- android:src="@drawable/ic_voice_search_holo_dark"
- style="@style/HoloButton"
- android:visibility="gone" />
- <ImageView
- android:id="@+id/clear"
- android:layout_width="wrap_content"
- android:layout_height="match_parent"
android:paddingRight="4dip"
+ android:src="@drawable/ic_voice_search_holo_dark"
+ android:visibility="gone" />
+
+ <ImageButton
+ android:id="@+id/clear"
+ style="@style/NavButton"
+ android:layout_width="wrap_content"
android:contentDescription="@string/accessibility_button_clear"
- android:src="@drawable/ic_close_window_holo_dark"
- style="@style/HoloButton"
+ android:src="@drawable/ic_action_stop"
android:visibility="gone" />
</LinearLayout>
- <ImageButton
- android:id="@+id/tab_switcher"
- android:layout_width="wrap_content"
+
+ <FrameLayout
android:layout_height="match_parent"
+ android:layout_width="wrap_content">
+
+ <ImageButton
+ android:id="@+id/tab_switcher"
+ style="@style/NavButton"
+ android:layout_width="wrap_content"
android:contentDescription="@string/accessibility_button_navscreen"
- android:src="@drawable/ic_windows_holo_dark"
- style="@style/HoloButton" />
+ android:src="@drawable/ic_action_tabswitcher" />
+
+ <TextView
+ android:id="@+id/tab_switcher_text"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_gravity="center"
+ android:paddingBottom="3dp"
+ android:paddingRight="2dp"
+ android:clickable="false"
+ android:text="0" >
+ </TextView>
+ </FrameLayout>
+
<ImageButton
android:id="@+id/more_browser_settings"
- android:layout_width="wrap_content"
- android:layout_height="match_parent"
- style="@style/HoloButton"
- android:gravity="center_vertical"
- android:contentDescription="@string/accessibility_button_more"
- android:src="@drawable/ic_menu_overflow" />
+ style="@style/OverflowButton" />
</com.android.browser.NavigationBarPhone>
diff --git a/res/layout/title_bar_snapshot.xml b/res/layout/title_bar_snapshot.xml
index c46dd6f..13a35ac 100644
--- a/res/layout/title_bar_snapshot.xml
+++ b/res/layout/title_bar_snapshot.xml
@@ -18,10 +18,9 @@
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:orientation="horizontal"
- android:background="@drawable/bg_urlbar">
+ android:orientation="horizontal" >
<ImageView
- android:src="@drawable/ic_search_category_history"
+ android:src="@drawable/ic_suggest_history_normal"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:paddingLeft="8dip" />
@@ -52,19 +51,31 @@
android:gravity="center_vertical"
android:textAppearance="?android:attr/textAppearanceMedium" />
</FrameLayout>
- <ImageButton
- android:id="@+id/tab_switcher"
- android:layout_width="wrap_content"
+
+ <FrameLayout
android:layout_height="match_parent"
- android:src="@drawable/ic_windows_holo_dark"
- android:contentDescription="@string/accessibility_button_navscreen"
- style="@style/HoloButton" />
+ android:layout_width="wrap_content">
+
+ <ImageButton
+ android:id="@+id/tab_switcher"
+ style="@style/NavButton"
+ android:layout_width="wrap_content"
+ android:contentDescription="@string/accessibility_button_navscreen"
+ android:src="@drawable/ic_action_tabswitcher" />
+
+ <TextView
+ android:id="@+id/tab_switcher_text"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_gravity="center"
+ android:paddingBottom="3dp"
+ android:paddingRight="2dp"
+ android:clickable="false"
+ android:text="0" >
+ </TextView>
+ </FrameLayout>
+
<ImageButton
android:id="@+id/more"
- android:layout_width="wrap_content"
- android:layout_height="match_parent"
- style="@style/HoloButton"
- android:gravity="center_vertical"
- android:src="@drawable/ic_menu_moreoverflow_normal_holo_dark"
- android:contentDescription="@string/accessibility_button_more" />
+ style="@style/OverflowButton" />
</com.android.browser.SnapshotBar>
diff --git a/res/layout/two_button_plus_menu_item.xml b/res/layout/two_button_plus_menu_item.xml
index ae47f53..5ec508b 100644
--- a/res/layout/two_button_plus_menu_item.xml
+++ b/res/layout/two_button_plus_menu_item.xml
@@ -30,10 +30,5 @@
<ImageButton
android:id="@+id/button_three"
- android:layout_width="0dp"
- android:layout_height="match_parent"
- android:layout_weight="6"
- android:background="?android:attr/listChoiceBackgroundIndicator"
- android:scaleType="center"
- />
+ style="@style/OverflowButton" />
</LinearLayout>
\ No newline at end of file
diff --git a/res/menu/url_selection.xml b/res/menu/url_selection.xml
index 8f4a93c..23e84b3 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_share_holo_dark"
+ android:icon="@drawable/ic_action_share"
android:title="@string/menu_share_url"
android:showAsAction="always|withText"
/>
diff --git a/res/values-sw600dp/integers.xml b/res/values-sw600dp/integers.xml
index abdafbf..8c76458 100644
--- a/res/values-sw600dp/integers.xml
+++ b/res/values-sw600dp/integers.xml
@@ -12,6 +12,8 @@
-->
<resources
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <!-- use horizontal tabs navigation -->
+ <integer name="nav_tab_orientation">0</integer>
<!-- The number of lines in the suggestions dropdown in landscape -->
<integer name="max_suggest_lines_landscape">5</integer>
<!-- The number of lines in the suggestions dropdown in portrait -->
diff --git a/res/values-sw600dp/styles.xml b/res/values-sw600dp/styles.xml
index 699f10a..44fe540 100644
--- a/res/values-sw600dp/styles.xml
+++ b/res/values-sw600dp/styles.xml
@@ -14,18 +14,15 @@
limitations under the License.
-->
<resources>
- <style name="BrowserTheme" parent="@android:Theme.Holo">
- <item name="android:windowBackground">@color/white</item>
- <item name="android:colorBackground">#FFFFFFFF</item>
+
+ <style name="BrowserTheme" parent="@style/BrowserBase">
+ <item name="android:windowBackground">@color/browser_window_background</item>
+
<item name="android:windowActionBar">true</item>
<item name="android:windowNoTitle">false</item>
+ <!--<item name="android:windowActionModeOverlay">true</item>-->
<item name="android:actionBarStyle">@style/ActionBarStyle</item>
<item name="android:actionBarSize">56dip</item>
</style>
- <style name="Suggestions" parent="@android:style/Widget.Holo.AutoCompleteTextView">
- </style>
- <style name="ActionBarStyle" parent="@android:style/Widget.Holo.ActionBar">
- <item name="android:background">@drawable/bg_browsertabs</item>
- <item name="android:displayOptions"></item>
- </style>
+
</resources>
diff --git a/res/values/colors.xml b/res/values/colors.xml
index c1c5df9..31853ac 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -20,6 +20,23 @@
<!-- FIXME: Change the name of this file! It is now being used generically
for the browser -->
<resources>
+
+ <!-- fundamental colors -->
+ <color name="primary">#ffffff</color>
+ <color name="navigation_bars">#101828</color>
+ <color name="accent">#008aa1</color>
+ <color name="browser_window_background">#ffffff</color>
+
+ <!-- derived colors -->
+ <color name="NavigationBarBackground">#ffffff</color> <!-- reference: f2f2f2 -->
+ <color name="NavigationBarUnderline">#b3b3b3</color>
+ <color name="PopupBackground">#ffffff</color>
+ <color name="TabNavBackgroundColor">#757575</color>
+ <color name="TabPassiveMessageBackground">#f2f2f2</color>
+ <color name="TabPassiveMessageLine">#b3b3b3</color>
+
+
+ <!-- legacy colors -->
<color name="white">#ffffffff</color>
<color name="black">#ff000000</color>
diff --git a/res/values/integers.xml b/res/values/integers.xml
index 0ce7ea7..84c48be 100644
--- a/res/values/integers.xml
+++ b/res/values/integers.xml
@@ -12,6 +12,8 @@
-->
<resources
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <!-- use vertical tabs navigation -->
+ <integer name="nav_tab_orientation">1</integer>
<!-- The number of lines in the suggestions dropdown in landscape -->
<integer name="max_suggest_lines_landscape">5</integer>
<!-- The number of lines in the suggestions dropdown in portrait -->
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 67134a1..61c5d9e 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -20,7 +20,7 @@
<!-- The name of the application. -->
<string name="application_name">Browser</string>
<!-- The name of standalone application. -->
- <string name="application_name_swe">SWE Android Browser</string>
+ <string name="application_name_swe">Browser</string>
<!-- Displayed with a file picker to choose a file to upload -->
<string name="choose_upload">Choose file for upload</string>
<!-- Toast to show the user after they try to open the file picker but no apps on the
@@ -1095,7 +1095,7 @@
<!-- Toast message displayed when the full screen received message -->
<string name="received_message_full_screen">Receive a message from: <xliff:g id="FROM">%s</xliff:g>.</string>
<string name="acivity_not_found">No activity found to handle this intent <xliff:g id="NOACTIVITY">%s</xliff:g></string>
- <!-- SWE Android Browser -->
+ <!-- Snapdragon Browser Additions -->
<string name="ssl_certificate">Security certificate</string>
<string name="ssl_certificate_is_valid">This certificate is valid.</string>
<string name="version">Version</string>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 751451a..106c803 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -18,65 +18,93 @@
*/
-->
<resources>
- <style name="BrowserTheme" parent="@android:Theme.Holo">
- <item name="android:windowBackground">@color/white</item>
- <item name="android:colorBackground">#FFFFFFFF</item>
+
+ <!-- parents that change depending on version -->
+ <style name="BrowserBase" parent="@android:style/Theme.Holo.Light">
+ <item name="android:windowContentOverlay">@null</item>
+ </style>
+ <style name="DialogWhenLarge" parent="@android:style/Theme.Holo.Light.DialogWhenLarge" >
+ <item name="android:windowActionBar">false</item>
+ </style>
+ <style name="ActionBarStyle" parent="@android:style/Widget.Holo.Light.ActionBar">
+ <item name="android:displayOptions"></item>
+ </style>
+ <style name="PopupMenuStyle" parent="@android:style/Widget.Holo.Light.PopupMenu">
+ </style>
+ <style name="Suggestions" parent="@android:style/Widget.Holo.Light.AutoCompleteTextView">
+ <item name="android:popupBackground">@color/NavigationBarBackground</item>
+ <item name="android:dropDownHorizontalOffset">0dip</item>
+ <item name="android:dropDownVerticalOffset">0dip</item>
+ </style>
+ <style name="TextAppearance.Medium" parent="@android:style/TextAppearance.Holo.Medium" />
+ <style name="TextAppearance.Small" parent="@android:style/TextAppearance.Holo.Small" />
+
+
+ <!-- common theme elements -->
+
+ <style name="BrowserTheme" parent="@style/BrowserBase">
+ <item name="android:windowBackground">@color/browser_window_background</item>
+
<item name="android:windowActionBar">false</item>
<item name="android:windowNoTitle">true</item>
<item name="android:windowActionModeOverlay">true</item>
<item name="android:actionBarStyle">@style/ActionBarStyle</item>
+ <item name="android:actionBarSize">56dip</item>
+ <item name="android:popupMenuStyle">@style/PopupMenuStyle</item>
</style>
- <style name="DialogWhenLarge" parent="@android:style/Theme.Holo.DialogWhenLarge" >
- <item name="android:windowActionBar">false</item>
- </style>
- <style name="BookmarkTheme" parent="@android:Theme.Holo">
+
+ <style name="BookmarkTheme" parent="@style/BrowserBase">
<item name="android:windowActionBar">false</item>
<item name="android:windowNoTitle">true</item>
<item name="android:colorBackgroundCacheHint">@null</item>
<item name="android:windowFrame">@null</item>
- <item name="android:windowContentOverlay">@null</item>
<item name="android:windowIsFloating">true</item>
<item name="android:backgroundDimEnabled">false</item>
<item name="android:windowIsTranslucent">true</item>
</style>
- <style name="ActionBarStyle" parent="@android:style/Widget.Holo.ActionBar">
- <item name="android:background">@drawable/bg_urlbar</item>
- <item name="android:displayOptions"></item>
+
+ <style name="ShortcutTheme" parent="@style/BrowserBase">
</style>
- <style name="Suggestions" parent="@android:style/Widget.Holo.AutoCompleteTextView">
- <item name="android:popupBackground">#D0000000</item>
- <item name="android:dropDownVerticalOffset">0dip</item>
+
+
+ <style name="NavButton">
+ <item name="android:background">?android:attr/selectableItemBackground</item>
+ <item name="android:layout_height">match_parent</item>
+ <item name="android:paddingLeft">8dip</item>
+ <item name="android:paddingRight">8dip</item>
</style>
- <style name="SuggestionLineMedium"
- parent="@android:style/TextAppearance.Holo.Medium">
+ <style name="NavButtonWide" parent="@style/NavButton">
+ <item name="android:layout_width">96dp</item>
+ </style>
+
+ <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_height">match_parent</item>
+ <item name="android:gravity">center_vertical</item>
+ </style>
+
+ <style name="SuggestionLineMedium" parent="@style/TextAppearance.Medium">
<item name="android:textSize">16sp</item>
</style>
- <style name="SuggestionLineSmall"
- parent="@android:style/TextAppearance.Holo.Small">
+ <style name="SuggestionLineSmall" parent="@style/TextAppearance.Small">
<item name="android:textSize">12sp</item>
</style>
- <style name="ActionBar" parent="@android:style/Widget.ActionBar">
- <item name="android:background">@color/black</item>
+
+ <style name="HoloIcon">
+ <item name="android:layout_marginLeft">16dip</item>
</style>
- <style name="ShortcutTheme" parent="@android:Theme.Holo.DialogWhenLarge">
- </style>
+
<style name="TitleBar">
<item name="android:windowEnterAnimation">@anim/title_bar_enter</item>
<item name="android:windowExitAnimation">@anim/title_bar_exit</item>
</style>
- <style name="HoloIcon">
- <item name="android:layout_marginLeft">16dip</item>
- </style>
- <style name="HoloButton">
- <item name="android:background">?android:attr/selectableItemBackground</item>
- <item name="android:paddingLeft">8dip</item>
- <item name="android:paddingRight">8dip</item>
- </style>
- <style name="TabTitleSelected" parent="@android:style/TextAppearance.Small">
+
+ <style name="TabTitleSelected" parent="@style/TextAppearance.Small">
<item name="android:textColor">?android:attr/textColorPrimary</item>
<item name="android:textStyle">bold</item>
</style>
- <style name="TabTitleUnselected" parent="@android:style/TextAppearance.Small">
+ <style name="TabTitleUnselected" parent="@style/TextAppearance.Small">
<item name="android:textColor">?android:attr/textColorSecondary</item>
<item name="android:textStyle">normal</item>
</style>
@@ -93,15 +121,16 @@
<item name="android:imeOptions">flagNoExtractUi|actionNext</item>
<item name="android:singleLine">true</item>
</style>
- <style name="OverflowMenuThemeBase" parent="BrowserTheme">
- <item name="android:popupBackground">@null</item>
+
+ <style name="OverflowMenuThemeBase" parent="@style/BrowserTheme">
+ <item name="android:background">@color/PopupBackground</item>
<item name="android:listDivider">@null</item>
<item name="android:listPreferredItemHeightSmall">48dp</item>
<item name="android:listPreferredItemPaddingStart">16dp</item>
<item name="android:listPreferredItemPaddingEnd">16dp</item>
<item name="android:textSize">16sp</item>
</style>
- <style name="OverflowMenuTheme" parent="OverflowMenuThemeBase" />
+ <style name="OverflowMenuTheme" parent="@style/OverflowMenuThemeBase" />
<style name="OverflowMenuAnim">
<item name="android:windowEnterAnimation">@anim/menu_enter</item>
<item name="android:windowExitAnimation">@anim/menu_exit</item>
diff --git a/res/xml/searchable.xml b/res/xml/searchable.xml
index a06d5b0..69b5108 100644
--- a/res/xml/searchable.xml
+++ b/res/xml/searchable.xml
@@ -18,7 +18,7 @@
is actually used to enter Uri's to load and display. -->
<searchable xmlns:android="http://schemas.android.com/apk/res/android"
- android:icon="@drawable/ic_search_category_browser"
+ android:icon="@drawable/ic_suggest_browser_normal"
android:label="@string/search_label"
android:hint="@string/search_hint"
android:searchButtonText="@string/search_button_text"
