From 68faf1c714461e500a5dbfc1156c074e12137391 Mon Sep 17 00:00:00 2001
From: Pankaj Garg <pgarg@codeaurora.org>
Date: Fri, 26 Jun 2015 17:07:37 -0700
Subject: SWE UI cleanup

- ActionBar color and styling for KK
- Use High Res icon for bookmarks
- Edge Nav setting string
- Combo view cleanup
- Tablet UI cleanup

Change-Id: I1859226e80d9943ee6af30c2cc9a5bd9ce5b9399
---
 res/layout/bookmark_group_view.xml | 1 +
 res/layout/bookmarks.xml           | 5 ++---
 res/layout/history.xml             | 5 +++--
 res/layout/snapshots.xml           | 8 +++++++-
 res/values-land/dimensions.xml     | 1 +
 res/values-sw600dp-v17/styles.xml  | 2 +-
 res/values-v17/styles.xml          | 8 +++++---
 res/values-v21/styles.xml          | 4 ----
 res/values/dimensions.xml          | 3 +--
 res/values/strings.xml             | 3 ++-
 10 files changed, 23 insertions(+), 17 deletions(-)

(limited to 'res')

diff --git a/res/layout/bookmark_group_view.xml b/res/layout/bookmark_group_view.xml
index e5bc767b..8eede042 100644
--- a/res/layout/bookmark_group_view.xml
+++ b/res/layout/bookmark_group_view.xml
@@ -27,6 +27,7 @@
         android:layout_height="match_parent"
         android:paddingStart="50dp"
         android:textAppearance="@style/BookmarkText"
+        android:textColor="@color/accent"
         android:gravity="center_vertical" />
 
     <FrameLayout
diff --git a/res/layout/bookmarks.xml b/res/layout/bookmarks.xml
index 182381a1..d4238f5c 100644
--- a/res/layout/bookmarks.xml
+++ b/res/layout/bookmarks.xml
@@ -18,13 +18,12 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical"
-    >
+    android:paddingTop="@dimen/combo_paddingTop">
 
     <FrameLayout
         android:layout_width="match_parent"
         android:layout_height="fill_parent"
-        android:layout_weight="90"
-        android:paddingTop="@dimen/combo_paddingTop">
+        android:layout_weight="90" >
         <com.android.browser.view.BookmarkExpandableView
             android:id="@+id/grid"
             android:layout_width="match_parent"
diff --git a/res/layout/history.xml b/res/layout/history.xml
index 705c32de..1636fe6a 100644
--- a/res/layout/history.xml
+++ b/res/layout/history.xml
@@ -18,12 +18,13 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:orientation="vertical" >
+    android:orientation="vertical"
+    android:paddingTop="@dimen/combo_paddingTop">
 
     <FrameLayout
         android:layout_width="match_parent"
         android:layout_weight="90"
-        android:layout_height="match_parent" >
+        android:layout_height="fill_parent" >
 
         <ExpandableListView
             android:id="@+id/history"
diff --git a/res/layout/snapshots.xml b/res/layout/snapshots.xml
index 045a4185..30d4ca44 100644
--- a/res/layout/snapshots.xml
+++ b/res/layout/snapshots.xml
@@ -18,7 +18,7 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:paddingTop="@dimen/combo_snapshot_paddingTop">
+    android:paddingTop="@dimen/combo_paddingTop">
 
     <com.android.browser.view.SnapshotGridView
         android:id="@+id/grid"
@@ -37,6 +37,12 @@
         android:text="@string/empty_snapshots_folder"
         android:visibility="gone" />
 
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/combo_shadow_height"
+        android:layout_gravity="bottom"
+        android:background="@drawable/shadow_top" />
+
     <View
         android:layout_width="match_parent"
         android:layout_height="@dimen/combo_shadow_height"
diff --git a/res/values-land/dimensions.xml b/res/values-land/dimensions.xml
index 5294d6e4..262ca488 100644
--- a/res/values-land/dimensions.xml
+++ b/res/values-land/dimensions.xml
@@ -17,4 +17,5 @@
     <dimen name="preference_widget_width">72dp</dimen>
     <dimen name="nav_tab_width">225dip</dimen>
     <dimen name="nav_tab_height">150dip</dimen>
+    <dimen name="combo_paddingTop">60dip</dimen>
 </resources>
diff --git a/res/values-sw600dp-v17/styles.xml b/res/values-sw600dp-v17/styles.xml
index 84b17b5b..4ad6ee61 100644
--- a/res/values-sw600dp-v17/styles.xml
+++ b/res/values-sw600dp-v17/styles.xml
@@ -21,7 +21,7 @@
         <item name="android:windowActionBar">true</item>
         <item name="android:windowNoTitle">false</item>
         <!--<item name="android:windowActionModeOverlay">true</item>-->
-        <item name="android:actionBarStyle">@style/LightActionBarStyle</item>
+        <item name="android:actionBarStyle">@style/LightActionBarSolidStyle</item>
         <item name="android:actionBarSize">56dip</item>
     </style>
 
diff --git a/res/values-v17/styles.xml b/res/values-v17/styles.xml
index 636ad934..73eed02e 100644
--- a/res/values-v17/styles.xml
+++ b/res/values-v17/styles.xml
@@ -26,9 +26,6 @@
     <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.Solid.Inverse">
-        <item name="android:displayOptions">none</item>
-    </style>
     <style name="PopupMenuStyle" parent="@android:style/Widget.Holo.Light.PopupMenu">
     </style>
     <style name="Suggestions" parent="@android:style/Widget.Holo.Light.AutoCompleteTextView">
@@ -74,6 +71,11 @@
     </style>
 
     <style name="SettingsTheme" parent="@style/BrowserBase">
+        <item name="android:actionBarStyle"
+            >@android:style/Widget.Holo.Light.ActionBar.Solid.Inverse</item>
+    </style>
+
+    <style name="LightActionBarSolidStyle" parent="@android:style/Widget.Holo.Light.ActionBar.Solid">
     </style>
 
     <style name="LightActionBarStyle" parent="@android:style/Widget.Holo.Light.ActionBar">
diff --git a/res/values-v21/styles.xml b/res/values-v21/styles.xml
index b362b77c..93e82119 100644
--- a/res/values-v21/styles.xml
+++ b/res/values-v21/styles.xml
@@ -35,16 +35,12 @@
         <item name="android:colorPrimary">@color/primary</item>
         <item name="android:colorPrimaryDark">@color/navigation_bars</item>
         <item name="android:colorAccent">@color/accent</item>
-        <item name="android:navigationBarColor">@color/navigation_bars</item>
         <item name="android:colorEdgeEffect">@color/primary</item>
     </style>
 
     <style name="DialogWhenLarge" parent="@android:style/Theme.Material.Light.DialogWhenLarge" >
         <item name="android:windowActionBar">false</item>
     </style>
-    <style name="ActionBarStyle" parent="@android:style/Widget.Material.Light.ActionBar">
-        <item name="android:displayOptions"></item>
-    </style>
     <style name="PopupMenuStyle" parent="@android:style/Widget.Material.Light.PopupMenu">
     </style>
     <style name="Suggestions" parent="@android:style/Widget.Material.Light.AutoCompleteTextView">
diff --git a/res/values/dimensions.xml b/res/values/dimensions.xml
index f0d59fbc..9ddfb98e 100755
--- a/res/values/dimensions.xml
+++ b/res/values/dimensions.xml
@@ -48,8 +48,7 @@
     <dimen name="widgetVerticalSpacing">6dip</dimen>
     <dimen name="widgetColumnWidth">80dip</dimen>
     <!-- For the combined Bookmarks History view -->
-    <dimen name="combo_paddingTop">0dip</dimen>
-    <dimen name="combo_snapshot_paddingTop">0dip</dimen>
+    <dimen name="combo_paddingTop">50dip</dimen>
     <dimen name="combo_horizontalSpacing">6dip</dimen>
     <dimen name="combo_bookmark_thumbnail_margin">4dip</dimen>
     <dimen name="combo_snapshot_item_padding">12dip</dimen>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index d00e8532..873fa507 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -404,7 +404,7 @@
     <!-- Settings summary for the WebRefiner -->
     <string name="pref_web_refiner_enabled_summary">Block advertisements and tracking</string>
     <string name="pref_web_refiner_blocked">Blocked</string>
-    <string name="pref_web_refiner_advertisements">advertisements</string>
+    <string name="pref_web_refiner_advertisements">distractions</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] -->
@@ -676,6 +676,7 @@
     <string name="pref_temporal_edge_swipe_enabled_toast">Swipe from edge to navigate</string>
     <string name="pref_spatial_edge_swipe_enabled_toast">Swipe from edge to change tabs</string>
     <string name="pref_edge_swipe_disabled_toast">Swiping from edge disabled</string>
+    <string name="pref_edge_swipe_unknown">Unknown</string>
     <string-array name="pref_edge_swiping_choices">
         <item>@string/pref_temporal_edge_swipe</item>
 <!--
-- 
cgit v1.2.3