gello: CyanogenMod style [2/2]

- Material dark theme
- Update colors palette
- Card-like tabs
- Updated menu entries
- Reordered settings

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

27 files changed, 242 insertions, 245 deletions

diff --git a/AndroidManifest.xml.jinja2 b/AndroidManifest.xml.jinja2
index edf94254..c52267dd 100644
--- a/AndroidManifest.xml.jinja2
+++ b/AndroidManifest.xml.jinja2
@@ -16,7 +16,9 @@
  */
 -->
 
-<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="{{ manifest_package }}">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="{{ manifest_package }}"
+    android:installLocation="internalOnly">
 
     <permission android:name="{{ app_package_name }}.permission.PRELOAD"
         android:label="@string/permission_preload_label"
@@ -411,7 +413,7 @@
 
     </application>
 
-    <uses-sdk android:minSdkVersion="16" android:targetSdkVersion="21" />
+    <uses-sdk android:minSdkVersion="21" android:targetSdkVersion="21" />
 
     <uses-feature android:name="android.hardware.location.gps" android:required="false" />
 
diff --git a/res/drawable/img_deco_tile_unknow.xml b/res/drawable/img_deco_tile_unknow.xml
deleted file mode 100644
index ac5229c7..00000000
--- a/res/drawable/img_deco_tile_unknow.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-
-    <path
-        android:fillColor="@color/icon_white"
-        android:pathData="M19,5 L19,19 L5,19 L5,5 L19,5 M19,3 L5,3 C3.90000009537,3,3,3.90000009537,3,5
-L3,19 C3,20.1000003815,3.90000009537,21,5,21 L19,21
-C20.1000003815,21,21,20.1000003815,21,19 L21,5
-C21,3.90000009537,20.1000003815,3,19,3 Z" />
-    <path
-        android:pathData="M0,0 L24,0 L24,24 L0,24 Z" />
-</vector>
diff --git a/res/drawable/img_deco_tile_unknown.xml b/res/drawable/img_deco_tile_unknown.xml
new file mode 100644
index 00000000..b36a345b
--- /dev/null
+++ b/res/drawable/img_deco_tile_unknown.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+
+    <path
+        android:fillColor="@color/icon_white"
+        android:pathData="M12,2 C17.5228481293,2,22,6.47715234756,22,12
+C22,17.5228481293,17.5228481293,22,12,22 C6.47715234756,22,2,17.5228481293,2,12
+C2,6.47715234756,6.47715234756,2,12,2 Z" />
+</vector>
diff --git a/res/drawable/img_deco_tile_unknown_accent.xml b/res/drawable/img_deco_tile_unknown_accent.xml
index 1d8ec8a2..ad3d818b 100644
--- a/res/drawable/img_deco_tile_unknown_accent.xml
+++ b/res/drawable/img_deco_tile_unknown_accent.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
+    android:width="12dp"
+    android:height="12dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
 
diff --git a/res/drawable/img_deco_tile_untrusted_accent.xml b/res/drawable/img_deco_tile_untrusted_accent.xml
index 1d8ec8a2..ad3d818b 100644
--- a/res/drawable/img_deco_tile_untrusted_accent.xml
+++ b/res/drawable/img_deco_tile_untrusted_accent.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
+    android:width="12dp"
+    android:height="12dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
 
diff --git a/res/drawable/img_deco_tile_verified_accent.xml b/res/drawable/img_deco_tile_verified_accent.xml
index 84f7ab5b..e9ade16b 100644
--- a/res/drawable/img_deco_tile_verified_accent.xml
+++ b/res/drawable/img_deco_tile_verified_accent.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
+    android:width="12dp"
+    android:height="12dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
 
diff --git a/res/layout/add_new_bookmark.xml b/res/layout/add_new_bookmark.xml
index cd6d22c9..078b5539 100644
--- a/res/layout/add_new_bookmark.xml
+++ b/res/layout/add_new_bookmark.xml
@@ -31,7 +31,7 @@
             android:layout_marginStart="5dip"
             android:layout_marginEnd="11dip"
             android:focusable="false"
-            android:src="@drawable/ic_action_bookmark_checked"
+            android:src="@drawable/ic_action_bookmark"
             android:scaleType="fitCenter"
             />
     <LinearLayout
diff --git a/res/layout/browser_add_bookmark_content.xml b/res/layout/browser_add_bookmark_content.xml
index 8c5191f6..61706e7b 100644
--- a/res/layout/browser_add_bookmark_content.xml
+++ b/res/layout/browser_add_bookmark_content.xml
@@ -60,7 +60,7 @@
             android:layout_height="wrap_content"
             android:layout_gravity="center_vertical"
             android:gravity="center_vertical"
-            android:drawableStart="@drawable/ic_action_bookmark_checked"
+            android:drawableStart="@drawable/ic_action_bookmark"
             android:text="@string/bookmark_this_page"
             android:textAppearance="?android:attr/textAppearanceMedium" />
         <View android:id="@+id/remove_divider"
diff --git a/res/layout/nav_screen.xml b/res/layout/nav_screen.xml
index 51109f7c..6e75aee7 100644
--- a/res/layout/nav_screen.xml
+++ b/res/layout/nav_screen.xml
@@ -17,7 +17,7 @@
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/TabNavBackgroundColor"
+    android:background="@color/trasparent"
     android:orientation="vertical">
 
     <com.android.browser.NavTabScroller
@@ -30,7 +30,7 @@
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="@dimen/toolbar_height"
-        android:background="@color/NavigationBarBackground"
+        android:background="@color/trasparent"
         android:gravity="end"
         android:orientation="horizontal">
 
@@ -46,14 +46,16 @@
                 style="@style/NavButtonWide"
                 android:contentDescription="@string/accessibility_button_newtab"
                 android:gravity="center_vertical"
-                android:src="@drawable/ic_action_add_tab" />
+                android:src="@drawable/ic_action_add_tab"
+                android:visibility="gone" />
 
             <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" />
+                android:src="@drawable/ic_action_add_incognito"
+                android:visibility="gone" />
         </LinearLayout>
 
         <ImageButton
@@ -61,11 +63,11 @@
             style="@style/OverflowButton" />
     </LinearLayout>
 
-    <!-- Cosmetic shadow (covered by anim_screen during transitions) -->
+    <!-- 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" />
+        android:background="@drawable/deco_cosmetic_topshadow" /-->
 
-</FrameLayout>
\ No newline at end of file
+</FrameLayout>
diff --git a/res/layout/nav_tab_view.xml b/res/layout/nav_tab_view.xml
index 1fde7895..1bf4b8de 100644
--- a/res/layout/nav_tab_view.xml
+++ b/res/layout/nav_tab_view.xml
@@ -19,45 +19,45 @@
     android:id="@+id/nav_tab"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
-    android:orientation="vertical"
-    android:background="@drawable/nav_tab_title_normal"
-    android:focusable="false">
+    android:orientation="vertical">
     <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:paddingStart="8dip" >
-        <TextView
-            android:id="@+id/title"
-            android:layout_width="0dip"
-            android:layout_height="match_parent"
-            android:layout_weight="1.0"
-            android:gravity="center_vertical"
-            android:singleLine="true"
-            android:ellipsize="end"
-            android:lines="1"
-            android:textAppearance="?android:attr/textAppearanceSmall"
-            android:scrollHorizontally="true"
-            android:drawablePadding="8dip" />
-
-        <ImageView
-            android:id="@+id/closetab"
-            style="@style/NavButton"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:orientation="vertical"
+        android:background="@drawable/card"
+        android:elevation="4dp"
+        android:focusable="false">
+        <LinearLayout
+            android:id="@+id/titlebar"
+            android:orientation="vertical"
             android:layout_width="wrap_content"
-            android:layout_gravity="center_vertical"
-            android:contentDescription="@string/accessibility_button_closetab"
-            android:paddingEnd="16dip"
-            android:src="@drawable/ic_action_close" />
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_horizontal"
+            android:paddingStart="8dp"
+            android:paddingEnd="8dp"
+            android:paddingTop="8dp"
+            android:paddingBottom="8dp">
+            <ImageView
+                android:id="@+id/tab_preview"
+                android:layout_width="@dimen/nav_tab_width"
+                android:layout_height="@dimen/nav_tab_height"
+                android:paddingStart="2dip"
+                android:paddingEnd="2dip"
+                android:focusable="false" />
+            <TextView
+                android:id="@+id/title"
+                android:layout_width="match_parent"
+                android:layout_height="@dimen/nav_tab_titleheight"
+                android:layout_weight="1.0"
+                android:layout_marginTop="4dp"
+                android:gravity="center_vertical"
+                android:singleLine="true"
+                android:ellipsize="end"
+                android:textAppearance="?android:attr/textAppearanceSmallInverse" />
+        </LinearLayout>
     </LinearLayout>
-
-    <!-- Preview Image -->
-    <ImageView
-        android:id="@+id/tab_preview"
-        android:layout_width="@dimen/nav_tab_width"
-        android:layout_height="@dimen/nav_tab_height"
-        android:paddingStart="2dip"
-        android:paddingEnd="2dip"
-        android:focusable="false" />
+    <FrameLayout
+        android:layout_width="match_parent"
+        android:layout_height="50dp"
+        android:background="@color/trasparent" />
 </LinearLayout>
diff --git a/res/layout/swe_preference_list_widget.xml b/res/layout/swe_preference_list_widget.xml
index b7cf7a0f..f294ac20 100644
--- a/res/layout/swe_preference_list_widget.xml
+++ b/res/layout/swe_preference_list_widget.xml
@@ -30,4 +30,4 @@
 <ImageView xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_height="wrap_content"
     android:layout_width="wrap_content"
-    android:background="@drawable/ic_sp_multi_choice" />
\ No newline at end of file
+    android:background="@color/trasparent" />
diff --git a/res/layout/title_bar_nav.xml b/res/layout/title_bar_nav.xml
index 375ba844..b5f865b9 100644
--- a/res/layout/title_bar_nav.xml
+++ b/res/layout/title_bar_nav.xml
@@ -17,14 +17,16 @@
 <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">
+    android:background="@color/primary"
+    android:orientation="horizontal"
+    android:elevation="8dp">
 
     <LinearLayout
         android:layout_width="0dip"
         android:layout_height="match_parent"
         android:layout_weight="1.0"
         android:gravity="center_vertical"
+        android:paddingStart="4dp"
         android:orientation="horizontal">
 
         <ImageView
@@ -36,15 +38,6 @@
             android:src="@drawable/ic_deco_incognito_normal"
             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:paddingStart="6dp"
-            android:paddingEnd="6dp"
-            android:visibility="visible" />
-
         <com.android.browser.SiteTileView
             android:id="@+id/favicon_view"
             android:layout_width="44dp"
@@ -53,6 +46,16 @@
             android:paddingEnd="6dp"
             android:contentDescription="@string/page_info"/>
 
+        <!-- Cosmetic separator -->
+        <View
+            android:layout_width="1dp"
+            android:layout_height="42dp"
+            android:paddingTop="4dp"
+            android:paddingBottom="4dp"
+            android:paddingEnd="2dp"
+            android:background="#55FAFAFA" />
+
+
         <ImageView
             android:id="@+id/stop"
             style="@style/NavButton"
@@ -62,7 +65,7 @@
             android:paddingStart="6dp"
             android:paddingEnd="6dp"
             android:visibility="gone"
-            android:src="@drawable/ic_action_stop" />
+            android:src="@drawable/ic_action_stop_normal_inverted" />
 
         <com.android.browser.UrlInputView
             android:id="@+id/url"
@@ -77,6 +80,7 @@
             android:focusable="true"
             android:hint="@string/search_hint"
             android:imeOptions="actionGo|flagNoExtractUi|flagNoFullscreen"
+            android:theme="@style/Widget.UrlInputView"
             android:inputType="textUri"
             android:lines="1"
             android:paddingStart="4dp"
@@ -120,14 +124,14 @@
             android:layout_height="wrap_content"
             android:layout_gravity="center"
             android:clickable="false"
-            android:paddingBottom="3dp"
-            android:paddingEnd="2dp"
-            android:textColor="#333"
+            android:paddingBottom="1dp"
+            android:paddingEnd="1dp"
+            android:textColor="@color/white"
             android:textSize="13dp"
             android:textStyle="bold" />
     </FrameLayout>
 
     <ImageButton
         android:id="@+id/more_browser_settings"
-        style="@style/OverflowButton" />
+        style="@style/OverflowButtonInverted" />
 </com.android.browser.NavigationBarPhone>
diff --git a/res/menu/browser.xml b/res/menu/browser.xml
index b2eb27a2..45dc75f4 100644
--- a/res/menu/browser.xml
+++ b/res/menu/browser.xml
@@ -40,32 +40,12 @@
             </item>
         </group>
 
-        <item>
-            <menu>
-                <item
-                    android:id="@+id/new_tab_menu_id"
-                    android:title="@string/new_tab"
-                    android:icon="@drawable/ic_action_add_tab" />
-                <item
-                    android:id="@+id/incognito_menu_id"
-                    android:title="@string/new_incognito_tab"
-                    android:icon="@drawable/ic_action_add_incognito" />
-<!--
-                <item
-                    android:id="@+id/close_other_tabs_id"
-                    android:title="@string/close_other_tabs"
-                    android:icon="@drawable/ic_action_close" />
--->
-            </menu>
-        </item>
-
         <item
-            android:id="@+id/bookmarks_menu_id"
-            android:title="@string/bookmarks"
-            android:showAsAction="never" />
+            android:id="@+id/new_tab_menu_id"
+            android:title="@string/new_tab" />
         <item
-            android:id="@+id/history_menu_id"
-            android:title="@string/history" />
+            android:id="@+id/incognito_menu_id"
+            android:title="@string/new_incognito_tab" />
         <item
             android:id="@+id/snapshots_menu_id"
             android:title="@string/tab_snapshots"
@@ -77,9 +57,8 @@
         <group
             android:id="@+id/LIVE_MENU">
             <item
-                android:id="@+id/ua_desktop_menu_id"
-                android:checkable="true"
-                android:title="@string/ua_switcher_desktop" />
+                android:id="@+id/share_page_menu_id"
+                android:title="@string/share_page" />
 
             <item
                 android:id="@+id/reader_mode_menu_id"
@@ -87,16 +66,22 @@
                 android:title="@string/enable_reader_mode" />
 
             <item
+                android:id="@+id/ua_desktop_menu_id"
+                android:checkable="true"
+                android:title="@string/ua_switcher_desktop" />
+
+            <item
                 android:id="@+id/save_snapshot_menu_id"
                 android:title="@string/menu_save_snapshot" />
             <item
                 android:id="@+id/add_to_homescreen"
                 android:title="@string/add_to_homescreen" />
-            <item
-                android:id="@+id/share_page_menu_id"
-                android:title="@string/share_page" />
         </group>
 
+        <item
+            android:id="@+id/bookmarks_menu_id"
+            android:title="@string/bookmarks" />
+
         <group
             android:id="@+id/SNAPSHOT_MENU"
             android:visible="false">
@@ -114,7 +99,8 @@
             android:title="@string/exit" />
         <item
             android:id="@+id/about_menu_id"
-            android:title="@string/about" />
+            android:title="@string/about"
+            android:visible="false" />
         <!-- followings are debug only -->
         <item
             android:id="@+id/dump_nav_menu_id"
@@ -170,4 +156,3 @@
         android:icon="@drawable/ic_action_reload"
         android:visible="false" />
 </menu>
-
diff --git a/res/values-v17/styles.xml b/res/values-v17/styles.xml
index 7f1e82a1..dd4a3fc5 100644
--- a/res/values-v17/styles.xml
+++ b/res/values-v17/styles.xml
@@ -40,7 +40,7 @@
     <!-- common theme elements -->
 
     <style name="BrowserTheme" parent="@style/BrowserBase">
-        <item name="android:windowBackground">@color/browser_window_background</item>
+        <item name="android:windowBackground">@color/black</item>
         <item name="android:windowActionBar">true</item>
         <item name="android:windowActionBarOverlay">true</item>
         <item name="android:windowNoTitle">false</item>
diff --git a/res/values-v21/styles.xml b/res/values-v21/styles.xml
index 5a40700e..0fce72c2 100644
--- a/res/values-v21/styles.xml
+++ b/res/values-v21/styles.xml
@@ -33,21 +33,41 @@
         <item name="android:windowContentOverlay">@null</item>
         <!-- these are defined just in Material attrs -->
         <item name="android:colorPrimary">@color/primary</item>
-        <item name="android:colorPrimaryDark">@color/navigation_bars</item>
+        <item name="android:colorPrimaryDark">@color/primary_dark</item>
         <item name="android:colorAccent">@color/accent</item>
         <item name="android:colorEdgeEffect">@color/primary</item>
     </style>
 
+    <style name="ActionBarStyle" parent="@android:style/ThemeOverlay.Material.Dark.ActionBar">
+        <item name="android:displayOptions">none</item>
+    </style>
+
+    <style name="OverflowButton" parent="@android:style/Widget.Material.ActionButton.Overflow">
+        <item name="android:src">@drawable/ic_action_overflow</item>
+        <item name="android:layout_width">44dp</item>
+        <item name="android:layout_height">match_parent</item>
+        <item name="android:paddingStart">4dp</item>
+        <item name="android:gravity">center_vertical</item>
+    </style>
+
+    <style name="OverflowButtonInverted" parent="@style/OverflowButton">
+        <item name="android:src">@drawable/ic_action_overflow_white</item>
+    </style>
+
     <style name="DialogWhenLarge" parent="@android:style/Theme.Material.Light.DialogWhenLarge" >
         <item name="android:windowActionBar">false</item>
     </style>
     <style name="PopupMenuStyle" parent="@android:style/Widget.Material.Light.PopupMenu">
     </style>
-    <style name="Suggestions" parent="@android:style/Widget.Material.Light.AutoCompleteTextView">
-        <item name="android:popupBackground">@color/NavigationBarBackground</item>
+    <style name="Suggestions" parent="@android:style/Widget.Material.AutoCompleteTextView">
+        <item name="android:popupBackground">@color/white</item>
         <item name="android:dropDownHorizontalOffset">0dip</item>
         <item name="android:dropDownVerticalOffset">0dip</item>
-        <item name="android:textColor">@color/default_text_color</item>
+        <item name="android:textColor">@color/icon_white</item>
+        <item name="android:textColorHint">@color/icon_black</item>
+    </style>
+    <style name="Widget.UrlInputView" parent="BrowserTheme">
+        <item name="android:colorAccent">@color/white</item>
     </style>
     <style name="TextAppearance.Medium" parent="@android:style/TextAppearance.Material.Medium" />
     <style name="TextAppearance.Small" parent="@android:style/TextAppearance.Material.Small" />
@@ -57,9 +77,9 @@
     <!-- common theme elements -->
 
     <style name="SettingsTheme" parent="@android:style/Theme.Material.Light.DarkActionBar">
-        <item name="android:colorPrimary">@color/accent</item>
+        <item name="android:colorPrimary">@color/primary</item>
+         <item name="android:colorPrimaryDark">@color/primary_dark</item>
         <item name="android:colorAccent">@color/accent</item>
-        <item name="android:colorEdgeEffect">@color/accent</item>
     </style>
 
 </resources>
diff --git a/res/values/colors.xml b/res/values/colors.xml
index c841434e..3f325d07 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -1,59 +1,69 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-/* //device/apps/common/assets/res/any/http_authentication_colors.xml
-**
-** Copyright 2006, 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.
-*/
+     Copyright (C) 2015 The CyanogenMod 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.
 -->
-<!-- FIXME: Change the name of this file!  It is now being used generically
-    for the browser -->
-<resources>
 
+<resources>
     <!-- fundamental colors -->
-    <color name="primary">#ffffff</color>
-    <color name="navigation_bars">#101828</color>
-    <color name="accent">#FF1AACA2</color>
-    <color name="browser_window_background">#ffffff</color>
+    <color name="white">#fafafa</color>
+    <color name="black">#14181C</color>
+    <color name="red">#f44336</color>
+    <color name="yellow">#ffc107</color>
+    <color name="green">#4caf50</color>
+    <color name="blue">#2196F3</color>
+
+    <color name="trasparent">#ffffffff</color>
+
+    <!-- chrome colors -->
+    <color name="icon_white">#DADADA</color>
+    <color name="icon_black">#5A5A5A</color>
+    <color name="green">#1AC222</color>
+    <color name="yellow">#FFB000</color>
+    <color name="red">#DB4437</color>
+    <color name="blue">#4285F4</color>
+
+    <!-- Material -->
+    <color name="primary">#263238</color>
+    <color name="primary_dark">#161E21</color>
+    <color name="accent">@color/blue</color>
+    <color name="accent_dark">#5595FE</color>
+    <color name="navigation_bars">@color/primary</color>
+    <color name="browser_window_background">#F2F2F2</color>
 
     <!-- derived colors -->
-    <color name="NavigationBarBackground">#ffffff</color>
-    <color name="NavigationBarBackgroundIncognito">#cccccc</color>
-    <color name="NavigationBarUnderline">#b3b3b3</color>
-    <color name="PopupBackground">#ffffff</color>
-    <color name="TabNavBackgroundColor">#757575</color>
+    <color name="NavigationBarBackground">@color/primary</color>
+    <color name="NavigationBarBackgroundIncognito">#5A5A5A</color>
+    <color name="PopupBackground">@color/white</color>
+    <color name="TabNavBackgroundColor">@color/white</color>
     <color name="TabPassiveMessageBackground">#f2f2f2</color>
     <color name="TabPassiveMessageLine">#b3b3b3</color>
 
-
     <!-- legacy colors -->
-    <color name="white">#ffffffff</color>
-    <color name="black">#ff000000</color>
-
     <color name="bookmarkWidgetHeader">#383847</color>
     <color name="bookmarkWidgetDivider">#383847</color>
     <color name="bookmarkWidgetItemBackground">#2b2b3c</color>
     <color name="bookmarkWidgetFolderBackground">#A0383847</color>
-    <color name="bookmarkWidgetFaviconBackground">#23ffffff</color>
-    <color name="bookmarkListFaviconBackground">#23ffffff</color>
-    <color name="bookmarkLabelColor">#555555</color>
-    <color name="comboViewActionBarColor">#ffffff</color>
+    <color name="bookmarkWidgetFaviconBackground">@color/white</color>
+    <color name="bookmarkListFaviconBackground">@color/white</color>
+    <color name="bookmarkLabelColor">@color/black</color>
+    <color name="comboViewActionBarColor">@color/white</color>
     <color name="comboViewBackground">#efeff0</color>
-    <color name="tabFaviconBackground">#FF555555</color>
-    <color name="tabFocusHighlight">#FF99CC00</color>
-    <color name="tabViewTitleBackground">#D0000000</color>
-    <color name="navtab_bg">#80606060</color>
+    <color name="tabFaviconBackground">@color/primary</color>
+    <color name="tabFocusHighlight">#99CC00</color>
+    <color name="tabViewTitleBackground">@color/black</color>
+    <color name="navtab_bg">@color/black</color>
 
     <color name="TileBadgeTextAvoid">#fff</color>
     <color name="TileBadgeTextUntrusted">#333</color>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 5a21bbcc..cfdb206f 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -325,6 +325,8 @@
         >Valid SSL certificate. Communication is encrypted and identity is verified.</string>
     <string name="pref_invalid_cert">Site has an invalid SSL certificate.</string>
     <string name="pref_warning_cert">Site SSL certificate has warnings.</string>
+    <!-- Settings screen, section title [CHAR LIMIT=50] -->
+    <string name="pref_interface_title">Interface</string>
     <!-- Label for option that when clicked opens the AutoFill settings screen. Also used as the title of that AutoFill Settings screen. [CHAR-LIMIT=32] -->
     <string name="pref_autofill_profile_editor">Auto-fill text</string>
     <!-- Summary for the AutoFill Settings preference [CHAR-LIMIT=none] -->
@@ -380,7 +382,8 @@
     <!-- Text on a checkbox in the "setup autofill" dialog which is shown to the user when they are prompted to set up the autofill feature.
          The checkbox allows them to specify they would like to disable the feature altogether [CHAR-LIMIT=NONE] -->
     <string name="disable_autofill">Disable auto-fill</string>
-
+    <!-- Settings screen, section title [CHAR-LIMIT=50] -->
+    <string name="pref_security_title">Security</string>
     <!-- Settings screen, section title [CHAR-LIMIT=50] -->
     <string name="pref_privacy_security_title">Privacy &amp; security</string>
     <string name="pref_privacy_security_title_summary">Browser security and privacy settings</string>
@@ -790,4 +793,6 @@
 
     <!-- Toast message displayed when user attempts to modify a setting disabled by the administrator -->
     <string name="mdm_managed_alert">Managed by your administrator</string>
+    <!-- My Navigation - Bookmarks + History + Saved -->
+    <string name="mystuffs">My Navigation</string>
 </resources>
diff --git a/res/xml/general_preferences.xml b/res/xml/general_preferences.xml
index d7045268..6d7e5b4f 100644
--- a/res/xml/general_preferences.xml
+++ b/res/xml/general_preferences.xml
@@ -36,6 +36,34 @@
             android:summary="@string/pref_content_search_engine_summary"
             android:title="@string/pref_content_search_engine" />
 
+        <com.android.browser.mdm.MdmCheckBoxPreference
+            android:layout="@layout/swe_preference"
+            android:key="autofill_enabled"
+            android:title="@string/pref_autofill_enabled"
+            android:summary="@string/pref_autofill_enabled_summary"
+            android:defaultValue="true" />
+
+        <PreferenceScreen
+            android:layout="@layout/swe_preference"
+            android:key="autofill_profile"
+            android:title="@string/pref_autofill_profile_editor"
+            android:summary="@string/pref_autofill_profile_editor_summary" />
+    </PreferenceCategory>
+
+    <PreferenceCategory android:title="@string/pref_interface_title"
+        android:layout="@layout/swe_preference_category"
+        android:key="interface">
+
+        <ListPreference
+            android:layout="@layout/swe_preference"
+            android:widgetLayout="@layout/swe_preference_list_widget"
+            android:dialogTitle="@string/pref_edge_swipe_option_msg"
+            android:entries="@array/pref_edge_swiping_choices"
+            android:entryValues="@array/pref_edge_swiping_values"
+            android:summary="%s"
+            android:key="edge_swiping_action"
+            android:title="@string/pref_edge_swipe_title" />
+
         <SwitchPreference
             android:layout="@layout/swe_preference"
             android:defaultValue="false"
@@ -50,35 +78,34 @@
             android:summary="@string/pref_nightmode_enabled_summary"
             android:title="@string/pref_nightmode_enabled" />
 
-        <SwitchPreference
-            android:layout="@layout/swe_preference"
-            android:defaultValue="false"
-            android:key="powersave_enabled"
-            android:summary="@string/pref_powersave_enabled_summary"
-            android:title="@string/pref_powersave_enabled" />
+    </PreferenceCategory>
 
-        <com.android.browser.mdm.MdmCheckBoxPreference
+    <PreferenceCategory android:title="@string/pref_security_title"
+        android:layout="@layout/swe_preference_category"
+        android:key="security">
+
+        <PreferenceScreen android:title="@string/pref_privacy_security_title"
+            android:summary="@string/pref_privacy_security_title_summary"
             android:layout="@layout/swe_preference"
-            android:key="autofill_enabled"
-            android:title="@string/pref_autofill_enabled"
-            android:summary="@string/pref_autofill_enabled_summary"
-            android:defaultValue="true" />
+            android:key="privacy_security" />
 
-        <PreferenceScreen
+        <PreferenceScreen android:title="@string/pref_content_title"
+            android:summary="@string/pref_content_title_summary"
             android:layout="@layout/swe_preference"
-            android:key="autofill_profile"
-            android:title="@string/pref_autofill_profile_editor"
-            android:summary="@string/pref_autofill_profile_editor_summary" />
+            android:key="content_settings" />
+
     </PreferenceCategory>
 
     <PreferenceCategory android:title="@string/pref_extras_title"
         android:layout="@layout/swe_preference_category"
         android:key="advanced">
 
-        <PreferenceScreen android:title="@string/pref_privacy_security_title"
-            android:summary="@string/pref_privacy_security_title_summary"
+        <SwitchPreference
             android:layout="@layout/swe_preference"
-            android:key="privacy_security" />
+            android:defaultValue="false"
+            android:key="powersave_enabled"
+            android:summary="@string/pref_powersave_enabled_summary"
+            android:title="@string/pref_powersave_enabled" />
 
         <PreferenceScreen
             android:layout="@layout/swe_preference"
@@ -86,22 +113,6 @@
             android:summary="@string/pref_accessibility_title_summary"
             android:title="@string/pref_accessibility_title"/>
 
-
-        <PreferenceScreen android:title="@string/pref_content_title"
-            android:summary="@string/pref_content_title_summary"
-            android:layout="@layout/swe_preference"
-            android:key="content_settings" />
-
-        <ListPreference
-            android:layout="@layout/swe_preference"
-            android:widgetLayout="@layout/swe_preference_list_widget"
-            android:dialogTitle="@string/pref_edge_swipe_option_msg"
-            android:entries="@array/pref_edge_swiping_choices"
-            android:entryValues="@array/pref_edge_swiping_values"
-            android:summary="%s"
-            android:key="edge_swiping_action"
-            android:title="@string/pref_edge_swipe_title" />
-
         <com.android.browser.BrowserYesNoPreference
             android:layout="@layout/swe_preference"
             android:key="reset_default_preferences"
diff --git a/src/com/android/browser/Controller.java b/src/com/android/browser/Controller.java
index 4a83f8a7..cbc6ba05 100644
--- a/src/com/android/browser/Controller.java
+++ b/src/com/android/browser/Controller.java
@@ -1966,7 +1966,6 @@ public class Controller
     }
 
     private void resetMenuItems(Menu menu) {
-        setMenuItemVisibility(menu, R.id.history_menu_id, true);
         setMenuItemVisibility(menu, R.id.find_menu_id, true);
 
         WebView w = getCurrentTopWebView();
@@ -2092,10 +2091,6 @@ public class Controller
                 bookmarksOrHistoryPicker(ComboViews.Bookmarks);
                 break;
 
-            case R.id.history_menu_id:
-                bookmarksOrHistoryPicker(ComboViews.History);
-                break;
-
             case R.id.snapshots_menu_id:
                 bookmarksOrHistoryPicker(ComboViews.Snapshots);
                 break;
diff --git a/src/com/android/browser/NavScreen.java b/src/com/android/browser/NavScreen.java
index 80201da9..d77d31c1 100644
--- a/src/com/android/browser/NavScreen.java
+++ b/src/com/android/browser/NavScreen.java
@@ -238,10 +238,7 @@ public class NavScreen extends RelativeLayout
             tabview.setOnClickListener(new OnClickListener() {
                 @Override
                 public void onClick(View v) {
-                    if (tabview.isClose(v)) {
-                        mScroller.animateOut(tabview);
-                        mTabViews.remove(tab);
-                    } else if (tabview.isTitle(v)) {
+                    if (tabview.isTitle(v)) {
                         switchToTab(tab);
                         close(position, false);
                         mUi.editUrl(false, true);
diff --git a/src/com/android/browser/NavTabView.java b/src/com/android/browser/NavTabView.java
index c79dafca..8be8c3d1 100644
--- a/src/com/android/browser/NavTabView.java
+++ b/src/com/android/browser/NavTabView.java
@@ -34,7 +34,6 @@ public class NavTabView extends LinearLayout {
 
     private ViewGroup mContent;
     private Tab mTab;
-    private ImageView mClose;
     private TextView mTitle;
     private View mTitleBar;
     ImageView mImage;
@@ -59,16 +58,11 @@ public class NavTabView extends LinearLayout {
     private void init() {
         LayoutInflater.from(getContext()).inflate(R.layout.nav_tab_view, this);
         mContent = (ViewGroup) findViewById(R.id.nav_tab);
-        mClose = (ImageView) findViewById(R.id.closetab);
         mTitle = (TextView) findViewById(R.id.title);
         mTitleBar = findViewById(R.id.titlebar);
         mImage = (ImageView) findViewById(R.id.tab_preview);
     }
 
-    protected boolean isClose(View v) {
-        return v == mClose;
-    }
-
     protected boolean isTitle(View v) {
         return v == mTitleBar;
     }
@@ -95,7 +89,6 @@ public class NavTabView extends LinearLayout {
         } else if (mTab.isPrivateBrowsingEnabled()) {
             mContent.setBackgroundResource(R.drawable.nav_tab_title_incognito);
             mTitle.setTextColor(getResources().getColor(R.color.white));
-            mClose.setImageResource(R.drawable.ic_action_close_inverted);
             setTitleIcon(R.drawable.ic_deco_incognito_normal);
         } else {
             setTitleIcon(0);
@@ -131,7 +124,6 @@ public class NavTabView extends LinearLayout {
     public void setOnClickListener(OnClickListener listener) {
         mClickListener = listener;
         mTitleBar.setOnClickListener(mClickListener);
-        mClose.setOnClickListener(mClickListener);
         if (mImage != null) {
             mImage.setOnClickListener(mClickListener);
         }
diff --git a/src/com/android/browser/NavigationBarBase.java b/src/com/android/browser/NavigationBarBase.java
index 799891c5..5591558e 100644
--- a/src/com/android/browser/NavigationBarBase.java
+++ b/src/com/android/browser/NavigationBarBase.java
@@ -76,7 +76,6 @@ public class NavigationBarBase extends LinearLayout implements
     protected ImageView mStopButton;
 
     private SiteTileView mFaviconTile;
-    private ImageView mMagnify;
     private View mVoiceButton;
     private ImageView mClearButton;
     private View mMore;
@@ -122,8 +121,6 @@ public class NavigationBarBase extends LinearLayout implements
         mUrlInput.addTextChangedListener(this);
         mMore = findViewById(R.id.more_browser_settings);
         mMore.setOnClickListener(this);
-        mMagnify = (ImageView) findViewById(R.id.magnify);
-        mMagnify.setOnClickListener(this);
         mFaviconTile = (SiteTileView) findViewById(R.id.favicon_view);
         mFaviconTile.setOnClickListener(this);
         mVoiceButton = findViewById(R.id.voice);
@@ -359,8 +356,6 @@ public class NavigationBarBase extends LinearLayout implements
             if (urlHasSitePrefs(url) && (wv != null && !wv.isShowingInterstitialPage()) ){
                 showSiteSpecificSettings();
             }
-        } else if (mMagnify == v) {
-            startEditingUrl(true, true);
         } else if (mVoiceButton == v) {
             mUiController.startVoiceRecognizer();
         } else if (mStopButton == v) {
@@ -760,14 +755,12 @@ public class NavigationBarBase extends LinearLayout implements
         switch(state) {
             case STATE_NORMAL:
                 mFaviconTile.setVisibility(View.VISIBLE);
-                mMagnify.setVisibility(View.GONE);
                 mMore.setVisibility(View.VISIBLE);
                 if (mUiController != null) {
                     Tab currentTab = mUiController.getCurrentTab();
                     if (currentTab != null){
                         if (TextUtils.isEmpty(currentTab.getUrl())) {
                             mFaviconTile.setVisibility(View.GONE);
-                            mMagnify.setVisibility(View.VISIBLE);
                         }
                         setDisplayTitle(currentTab.getTitle(), currentTab.getUrl());
                     }
@@ -777,7 +770,6 @@ public class NavigationBarBase extends LinearLayout implements
                 break;
             case STATE_HIGHLIGHTED:
                 mFaviconTile.setVisibility(View.GONE);
-                mMagnify.setVisibility(View.VISIBLE);
                 mClearButton.setVisibility(View.VISIBLE);
                 mMore.setVisibility(View.GONE);
                 if (mUiController != null) {
@@ -801,7 +793,6 @@ public class NavigationBarBase extends LinearLayout implements
                     mClearButton.setVisibility(View.VISIBLE);
                 }
                 mFaviconTile.setVisibility(View.GONE);
-                mMagnify.setVisibility(View.VISIBLE);
                 mMore.setVisibility(View.GONE);
                 break;
         }
diff --git a/src/com/android/browser/PhoneUi.java b/src/com/android/browser/PhoneUi.java
index ab4174fd..dd18c193 100644
--- a/src/com/android/browser/PhoneUi.java
+++ b/src/com/android/browser/PhoneUi.java
@@ -182,7 +182,6 @@ public class PhoneUi extends BaseUi {
         }
 
         if (showingNavScreen()) {
-            setMenuItemVisibility(menu, R.id.history_menu_id, false);
             setMenuItemVisibility(menu, R.id.find_menu_id, false);
             menu.setGroupVisible(R.id.LIVE_MENU, false);
             setMenuItemVisibility(menu, R.id.save_snapshot_menu_id, false);
@@ -201,7 +200,6 @@ public class PhoneUi extends BaseUi {
     @Override
     public boolean onOptionsItemSelected(MenuItem item) {
         if (showingNavScreen()
-                && (item.getItemId() != R.id.history_menu_id)
                 && (item.getItemId() != R.id.snapshots_menu_id)) {
             hideNavScreen(mUiController.getTabControl().getCurrentPosition(), false);
         }
diff --git a/src/com/android/browser/preferences/SWEPreferenceFragment.java b/src/com/android/browser/preferences/SWEPreferenceFragment.java
index 77c39c75..7bfd0d1e 100644
--- a/src/com/android/browser/preferences/SWEPreferenceFragment.java
+++ b/src/com/android/browser/preferences/SWEPreferenceFragment.java
@@ -83,10 +83,10 @@ public abstract class SWEPreferenceFragment extends PreferenceFragment  {
     public void onResume() {
         super.onResume();
 
-        ActionBar bar = getActivity().getActionBar();
+        /*ActionBar bar = getActivity().getActionBar();
         if (bar != null) {
             bar.setBackgroundDrawable(new ColorDrawable(getResources().getColor(R.color.accent)));
-        }
+        }*/
     }
 
     private final void findAndResizeSwitchPreferenceWidget(View parent) {
diff --git a/src/com/android/browser/preferences/SiteSpecificPreferencesFragment.java b/src/com/android/browser/preferences/SiteSpecificPreferencesFragment.java
index 23311b4d..b5d748df 100644
--- a/src/com/android/browser/preferences/SiteSpecificPreferencesFragment.java
+++ b/src/com/android/browser/preferences/SiteSpecificPreferencesFragment.java
@@ -606,15 +606,6 @@ public class SiteSpecificPreferencesFragment extends SWEPreferenceFragment
                                 ActionBar.DISPLAY_SHOW_TITLE);
                         mBar.setHomeButtonEnabled(true);
                         mBar.setIcon(new BitmapDrawable(getResources(), bitmap));
-                        mBar.setBackgroundDrawable(new ColorDrawable(color));
-                        NavigationBarBase.setStatusAndNavigationBarColor(getActivity(),
-                                NavigationBarBase.adjustColor(color, 1, 1, 0.7f));
-                    }
-                } else {
-                    if (mIconColor != 0) {
-                        mBar.setBackgroundDrawable(new ColorDrawable(mIconColor));
-                        NavigationBarBase.setStatusAndNavigationBarColor(getActivity(),
-                                NavigationBarBase.adjustColor(mIconColor, 1, 1, 0.7f));
                     }
                 }
             }
@@ -626,8 +617,6 @@ public class SiteSpecificPreferencesFragment extends SWEPreferenceFragment
         super.onPause();
         if (mBar != null) {
             mBar.setDisplayOptions(mOriginalActionBarOptions);
-            NavigationBarBase.setStatusAndNavigationBarColor(getActivity(),
-                    NavigationBarBase.getDefaultStatusBarColor());
         }
 
         // flush all the settings in pause to assure that writes happen
diff --git a/src/com/android/browser/preferences/WebsiteSettingsFragment.java b/src/com/android/browser/preferences/WebsiteSettingsFragment.java
index bb4a8d3b..c9dd04d3 100644
--- a/src/com/android/browser/preferences/WebsiteSettingsFragment.java
+++ b/src/com/android/browser/preferences/WebsiteSettingsFragment.java
@@ -323,7 +323,6 @@ public class WebsiteSettingsFragment extends ListFragment implements OnClickList
             bar.setTitle(R.string.pref_extras_website_settings);
             bar.setDisplayHomeAsUpEnabled(false);
             bar.setHomeButtonEnabled(false);
-            bar.setBackgroundDrawable(new ColorDrawable(getResources().getColor(R.color.accent)));
         }
     }
 
diff --git a/src/com/android/browser/provider/BrowserProvider2.java b/src/com/android/browser/provider/BrowserProvider2.java
index 78758442..53f567f8 100644
--- a/src/com/android/browser/provider/BrowserProvider2.java
+++ b/src/com/android/browser/provider/BrowserProvider2.java
@@ -130,7 +130,7 @@ public class BrowserProvider2 extends SQLiteContentProvider {
             qualifyColumn(TABLE_HISTORY, History.URL),
             bookmarkOrHistoryColumn(Combined.TITLE),
             bookmarkOrHistoryLiteral(Combined.URL,
-                    Integer.toString(R.drawable.ic_action_bookmark_normal),
+                    Integer.toString(R.drawable.ic_action_bookmark),
                     Integer.toString(R.drawable.ic_suggest_history_normal)),
             qualifyColumn(TABLE_HISTORY, History.DATE_LAST_VISITED)};