Browser: update UI

* Res
   - Rename (#themersgottahate)
   - Vectors
   - Card-Tabs
   - CleanUp
* Interface
   - Longpress fab to open incognito tab
   - New icon
   - Better urlbar
   - Fix tab animations
   - Remap PieControl
* Features
  - Immersive mode (replace jb fullscreen)

Change-Id: I2fde4242f477359dc8af18d1b7752750058cd6e9
Signed-off-by: jrizzoli <joey@cyanogenmoditalia.it>

17 files changed, 123 insertions, 125 deletions

diff --git a/res/layout/add_new_bookmark.xml b/res/layout/add_new_bookmark.xml
index 730b74e..f00374d 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_dark"
+            android:src="@drawable/ic_bookmark_on"
             android:scaleType="fitCenter"
             />
     <LinearLayout
diff --git a/res/layout/anim_screen.xml b/res/layout/anim_screen.xml
index 0cdc931..4015ba1 100644
--- a/res/layout/anim_screen.xml
+++ b/res/layout/anim_screen.xml
@@ -23,10 +23,6 @@
     android:focusable="false"
     android:background="@drawable/browser_background_holo">
     <ImageView
-        android:id="@+id/title"
-        android:layout_width="match_parent"
-        android:layout_height="@dimen/toolbar_height" />
-    <ImageView
         android:id="@+id/content"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
diff --git a/res/layout/bookmarks.xml b/res/layout/bookmarks.xml
index 09b442e..d19f778 100644
--- a/res/layout/bookmarks.xml
+++ b/res/layout/bookmarks.xml
@@ -4,9 +4,9 @@
      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.
diff --git a/res/layout/bookmarks_drag_actionmode.xml b/res/layout/bookmarks_drag_actionmode.xml
index 77e590f..17ae180 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_dark" />
+        android:src="@drawable/ic_web" />
     <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_dark" />
+        android:src="@drawable/ic_new_window" />
     <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_dark" />
+        android:src="@drawable/ic_home_info" />
 </LinearLayout>
diff --git a/res/layout/browser_add_bookmark_content.xml b/res/layout/browser_add_bookmark_content.xml
index 6b4bad9..bf76592 100644
--- a/res/layout/browser_add_bookmark_content.xml
+++ b/res/layout/browser_add_bookmark_content.xml
@@ -61,7 +61,7 @@
             android:layout_height="wrap_content"
             android:layout_gravity="center_vertical"
             android:gravity="center_vertical"
-            android:drawableLeft="@drawable/ic_bookmark_black"
+            android:drawableLeft="@drawable/ic_bookmark"
             android:text="@string/bookmark_this_page"
             android:textAppearance="?android:attr/textAppearanceMedium" />
         <View android:id="@+id/remove_divider"
@@ -76,7 +76,7 @@
             android:layout_gravity="center_vertical"
             android:gravity="center_vertical"
             android:text="@string/remove"
-            android:drawableLeft="@drawable/ic_delete_black"
+            android:drawableLeft="@drawable/ic_delete"
             android:visibility="gone"
             android:textAppearance="?android:attr/textAppearanceMedium" />
     </LinearLayout>
diff --git a/res/layout/browser_subwindow.xml b/res/layout/browser_subwindow.xml
index e1f05d7..c206a2b 100644
--- a/res/layout/browser_subwindow.xml
+++ b/res/layout/browser_subwindow.xml
@@ -27,11 +27,11 @@
         android:layout_gravity="right"
         android:gravity="right" >
         <ImageButton android:id="@+id/subwindow_close"
-            style="@style/HoloButton"
+            style="@style/BrowserButton"
             android:focusable="true"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:src="@drawable/ic_close_window_dark" />
+            android:src="@drawable/ic_close_window" />
     </LinearLayout>
     <LinearLayout
         android:id="@+id/inner_container"
diff --git a/res/layout/folder_list_item.xml b/res/layout/folder_list_item.xml
index 374c10f..ce47ebe 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_dark" />
+        android:src="@drawable/ic_folder" />
     <TextView
         android:id="@android:id/text1"
         android:layout_width="match_parent"
diff --git a/res/layout/four_button_menu_item.xml b/res/layout/four_button_menu_item.xml
new file mode 100644
index 0000000..99c4996
--- /dev/null
+++ b/res/layout/four_button_menu_item.xml
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright 2014 The Chromium Authors. All rights reserved.
+
+     Use of this source code is governed by a BSD-style license that can be
+     found in the LICENSE file.
+-->
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="?android:attr/listPreferredItemHeightSmall"
+    android:layout_gravity="top|start"
+    android:orientation="horizontal">
+
+    <ImageButton
+        android:id="@+id/button_one"
+        android:layout_width="0dp"
+        android:layout_height="match_parent"
+        android:paddingEnd="11dp"
+        android:layout_weight="24"
+        android:paddingStart="11dp"
+        android:background="?android:attr/listChoiceBackgroundIndicator"
+        android:scaleType="center" />
+
+    <ImageButton
+        android:id="@+id/button_two"
+        android:layout_width="0dp"
+        android:layout_height="match_parent"
+        android:layout_weight="24"
+        android:paddingStart="11dp"
+        android:paddingEnd="11dp"
+        android:background="?android:attr/listChoiceBackgroundIndicator"
+        android:scaleType="center" />
+
+    <ImageButton
+        android:id="@+id/button_three"
+        android:layout_width="0dp"
+        android:layout_height="match_parent"
+        android:layout_weight="24"
+        android:paddingStart="11dp"
+        android:paddingEnd="11dp"
+        android:background="?android:attr/listChoiceBackgroundIndicator"
+        android:scaleType="center" />
+
+    <ImageButton
+        android:id="@+id/button_four"
+        android:layout_width="0dp"
+        android:layout_height="match_parent"
+        android:layout_weight="24"
+        android:paddingStart="11dp"
+        android:paddingEnd="11dp"
+        android:background="?android:attr/listChoiceBackgroundIndicator"
+        android:scaleType="center" />
+</LinearLayout>
diff --git a/res/layout/nav_screen.xml b/res/layout/nav_screen.xml
index 46a86cf..d028ea1 100644
--- a/res/layout/nav_screen.xml
+++ b/res/layout/nav_screen.xml
@@ -19,7 +19,7 @@
     android:id="@+id/nav_screen"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@drawable/browser_background_holo">
+    android:background="@color/white">
     <com.android.browser.NavTabScroller
         android:id="@+id/scroller"
         android:layout_width="match_parent"
@@ -35,44 +35,37 @@
         android:background="@color/primary"
         android:elevation="8dp">
         <ImageButton
-            android:id="@+id/gotohome"
-            android:layout_width="wrap_content"
-            android:layout_height="match_parent"
-            style="@style/HoloButton"
-            android:gravity="center_vertical"
-            android:contentDescription="@string/accessibility_button_homescreen"
-            android:src="@drawable/ic_home_dark" />
-        <ImageButton
             android:id="@+id/newincognitotab"
             android:layout_width="wrap_content"
             android:layout_height="match_parent"
-            style="@style/HoloButton"
+            style="@style/BrowserButton"
             android:gravity="center_vertical"
             android:contentDescription="@string/accessibility_button_newincognitotab"
-            android:src="@drawable/ic_new_incognito_dark" />
+            android:visibility="gone"
+            android:src="@drawable/ic_incognito" />
         <ImageButton
             android:id="@+id/newtab"
             android:layout_width="wrap_content"
             android:layout_height="match_parent"
-            style="@style/HoloButton"
+            style="@style/BrowserButton"
             android:gravity="center_vertical"
             android:contentDescription="@string/accessibility_button_newtab"
             android:visibility="gone"
-            android:src="@drawable/ic_new_window_dark" />
+            android:src="@drawable/ic_new_window" />
         <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_dark"
-            style="@style/HoloButton" />
+            android:src="@drawable/ic_bookmarks_history"
+            style="@style/BrowserButton" />
         <ImageButton
             android:id="@+id/more"
             android:layout_width="wrap_content"
             android:layout_height="match_parent"
             android:paddingLeft="8dip"
             android:paddingRight="8dip"
-            style="@style/HoloButton"
+            style="@style/BrowserButton"
             android:gravity="center_vertical"
             android:contentDescription="@string/accessibility_button_more"
             android:src="@drawable/ic_menu_overflow" />
@@ -91,6 +84,6 @@
             android:layout_width="56dp"
             android:layout_height="56dp"
             android:background="@drawable/floating_action_button"
-            android:src="@drawable/ic_new_window_dark"/>
+            android:src="@drawable/ic_new_window"/>
     </FrameLayout>
 </RelativeLayout>
diff --git a/res/layout/nav_tab_view.xml b/res/layout/nav_tab_view.xml
index 5b1b55c..4f9c70f 100644
--- a/res/layout/nav_tab_view.xml
+++ b/res/layout/nav_tab_view.xml
@@ -12,52 +12,46 @@
      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.
+     android:background="@drawable/card"
 -->
 
-<LinearLayout
+<android.support.v7.widget.CardView
     xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:card_view="http://schemas.android.com/apk/res-auto"
     android:id="@+id/main"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
     android:orientation="vertical"
-    android:background="@drawable/nav_tab_bg"
     android:focusable="false"
-    android:elevation="6dp">
+    android:elevation="6dp"
+    card_view:cardCornerRadius="2dp"
+    card_view:cardElevation="4dp"
+    card_view:cardBackgroundColor="@color/primary"
+    card_view:contentPaddingLeft="8dp"
+    card_view:contentPaddingRight="8dp"
+    card_view:contentPaddingTop="8dp"
+    card_view:contentPaddingBottom="4dp"
+    card_view:cardUseCompatPadding="true">
     <LinearLayout
         android:id="@+id/titlebar"
-        android:orientation="horizontal"
-        android:layout_width="match_parent"
-        android:layout_height="@dimen/nav_tab_titleheight"
-        android:layout_gravity="center_horizontal"
-        android:paddingLeft="8dip" >
+        android:orientation="vertical"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center_horizontal">
+        <ImageView
+            android:id="@+id/tab_view"
+            android:src="@drawable/ic_stop"
+            android:layout_width="@dimen/nav_tab_width"
+            android:layout_height="@dimen/nav_tab_height"
+            android:focusable="false" />
         <TextView
             android:id="@+id/title"
-            android:layout_width="0dip"
-            android:layout_height="match_parent"
-            android:layout_weight="1.0"
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/nav_tab_titleheight"
+            android:layout_marginTop="4dp"
             android:gravity="center_vertical"
             android:singleLine="true"
             android:ellipsize="end"
-            android:lines="1"
-            android:textAppearance="?android:attr/textAppearanceSmallInverse"
-            android:scrollHorizontally="true"
-            android:drawablePadding="8dip" />
-        <ImageView
-            android:id="@+id/closetab"
-            android:src="@drawable/ic_tab_close"
-            android:layout_gravity="center_vertical"
-            android:layout_width="wrap_content"
-            android:layout_height="match_parent"
-            android:paddingRight="16dip"
-            android:contentDescription="@string/accessibility_button_closetab"
-            style="@style/HoloButton" />
+            android:textAppearance="?android:attr/textAppearanceSmallInverse" />
     </LinearLayout>
-    <ImageView
-        android:id="@+id/tab_view"
-        android:src="@drawable/ic_stop_dark"
-        android:layout_width="@dimen/nav_tab_width"
-        android:layout_height="@dimen/nav_tab_height"
-        android:paddingLeft="2dip"
-        android:paddingRight="2dip"
-        android:focusable="false" />
-</LinearLayout>
+</android.support.v7.widget.CardView>
diff --git a/res/layout/new_folder_layout.xml b/res/layout/new_folder_layout.xml
index 76cc2f2..d2ebdb4 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_dark" />
+        android:src="@drawable/ic_folder" />
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
diff --git a/res/layout/suggestion_item.xml b/res/layout/suggestion_item.xml
index 9a08517..acfa4f4 100644
--- a/res/layout/suggestion_item.xml
+++ b/res/layout/suggestion_item.xml
@@ -64,17 +64,10 @@
     <ImageView
         android:layout_width="wrap_content"
         android:layout_height="match_parent"
-        android:id="@+id/divider"
-        android:scaleType="center"
-        android:background="@*android:drawable/list_divider_holo_light"
-        />
-    <ImageView
-        android:layout_width="wrap_content"
-        android:layout_height="match_parent"
         android:id="@+id/icon2"
         android:scaleType="center"
         android:src="@drawable/ic_querybuilder"
-        android:background="?android:attr/selectableItemBackground"
+        android:background="?android:attr/selectableItemBackgroundBorderless"
         android:paddingRight="@dimen/suggest_item_padding"
         android:paddingLeft="@dimen/suggest_item_padding"
         />
diff --git a/res/layout/tab_bar.xml b/res/layout/tab_bar.xml
index 7d32a8c..144222c 100644
--- a/res/layout/tab_bar.xml
+++ b/res/layout/tab_bar.xml
@@ -28,6 +28,6 @@
         android:src="@drawable/ic_menu_new_window"
         android:layout_width="wrap_content"
         android:layout_height="match_parent"
-        style="@style/HoloButton"
+        style="@style/BrowserButton"
         android:background="@drawable/add_tab_selector" />
 </merge>
diff --git a/res/layout/tab_title.xml b/res/layout/tab_title.xml
index 954ffa3..226e18d 100644
--- a/res/layout/tab_title.xml
+++ b/res/layout/tab_title.xml
@@ -22,7 +22,7 @@
         android:layout_width="wrap_content"
         android:layout_height="match_parent"
         android:gravity="center_vertical"
-        android:src="@drawable/ic_incognito_dark"
+        android:src="@drawable/ic_incognito"
         android:contentDescription="@string/accessibility_state_incognito"
         android:visibility="gone" />
     <ImageView
@@ -59,7 +59,7 @@
         android:singleLine="true" />
     <ImageButton
         android:id="@+id/close"
-        android:background="?android:attr/selectableItemBackground"
+        android:background="?android:attr/selectableItemBackgroundBorderless"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:contentDescription="@string/accessibility_button_closetab"
diff --git a/res/layout/title_bar_nav.xml b/res/layout/title_bar_nav.xml
index 5052757..ef1d7e4 100644
--- a/res/layout/title_bar_nav.xml
+++ b/res/layout/title_bar_nav.xml
@@ -35,34 +35,7 @@
             android:paddingLeft="4dip"
             android:paddingRight="8dip"
             android:visibility="gone"
-            android:src="@drawable/ic_search_dark" />
-        <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_dark" />
-        <FrameLayout
-            android:id="@+id/iconcombo"
-            android:layout_width="44dip"
-            android:layout_height="match_parent"
-            android:contentDescription="@string/page_info"
-            style="@style/HoloButton">
-            <ImageView
-                android:id="@+id/favicon"
-                android:layout_width="32dip"
-                android:layout_height="32dip"
-                android:paddingLeft="4dip"
-                android:paddingRight="8dip"
-                android:layout_gravity="center" />
-            <ImageView
-                android:id="@+id/lock"
-                android:layout_width="32dip"
-                android:layout_height="32dip"
-                android:layout_gravity="center"
-                android:visibility="gone" />
-        </FrameLayout>
+            android:src="@drawable/ic_search" />
         <ImageView
             android:id="@+id/stop"
             android:layout_width="wrap_content"
@@ -70,8 +43,8 @@
             android:layout_gravity="center_vertical"
             android:paddingLeft="4dip"
             android:contentDescription="@string/accessibility_button_stop"
-            android:src="@drawable/ic_stop_dark"
-            style="@style/HoloButton" />
+            android:src="@drawable/ic_stop"
+            style="@style/BrowserButton" />
         <com.android.browser.UrlInputView
             android:id="@+id/url"
             android:focusable="true"
@@ -92,36 +65,34 @@
             android:theme="@style/Widget.UrlInputView"
             android:background="@null" />
         <ImageView
-            android:id="@+id/voice"
-            android:layout_width="wrap_content"
-            android:layout_height="match_parent"
-            android:paddingRight="4dip"
-            android:contentDescription="@string/accessibility_button_voice"
-            android:src="@drawable/ic_voice_search_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:contentDescription="@string/accessibility_button_clear"
-            android:src="@drawable/ic_close_window_dark"
-            style="@style/HoloButton"
+            android:src="@drawable/ic_close_window"
+            style="@style/BrowserButton"
             android:visibility="gone" />
+        <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" />
     </LinearLayout>
     <ImageButton
         android:id="@+id/tab_switcher"
         android:layout_width="wrap_content"
         android:layout_height="match_parent"
             android:contentDescription="@string/accessibility_button_navscreen"
-        android:src="@drawable/ic_windows_dark"
-        style="@style/HoloButton" />
+        android:src="@drawable/ic_windows"
+        style="@style/BrowserButton" />
     <ImageButton
         android:id="@+id/more"
         android:layout_width="wrap_content"
         android:layout_height="match_parent"
-        style="@style/HoloButton"
+        style="@style/BrowserButton"
         android:gravity="center_vertical"
         android:contentDescription="@string/accessibility_button_more"
         android:src="@drawable/ic_menu_overflow" />
diff --git a/res/layout/title_bar_snapshot.xml b/res/layout/title_bar_snapshot.xml
index c203a80..4dbc4e3 100644
--- a/res/layout/title_bar_snapshot.xml
+++ b/res/layout/title_bar_snapshot.xml
@@ -57,14 +57,14 @@
         android:id="@+id/tab_switcher"
         android:layout_width="wrap_content"
         android:layout_height="match_parent"
-        android:src="@drawable/ic_windows_dark"
+        android:src="@drawable/ic_windows"
         android:contentDescription="@string/accessibility_button_navscreen"
-        style="@style/HoloButton" />
+        style="@style/BrowserButton" />
     <ImageButton
         android:id="@+id/more"
         android:layout_width="wrap_content"
         android:layout_height="match_parent"
-        style="@style/HoloButton"
+        style="@style/BrowserButton"
         android:gravity="center_vertical"
         android:src="@*android:drawable/ic_menu_moreoverflow_normal_holo_dark"
         android:contentDescription="@string/accessibility_button_more" />
diff --git a/res/layout/widget_account_selection.xml b/res/layout/widget_account_selection.xml
index 5dcd210..a66d7b8 100644
--- a/res/layout/widget_account_selection.xml
+++ b/res/layout/widget_account_selection.xml
@@ -54,4 +54,3 @@
         </LinearLayout>
     </LinearLayout>
 </LinearLayout>
-