From 31405d0023c59787a094b31d72291761fcf8ac9b Mon Sep 17 00:00:00 2001
From: Fan Zhang <zhfan@google.com>
Date: Mon, 13 Jun 2016 13:50:13 -0700
Subject: [PATCH] Support tab UI polish.

Bug: 29107343
Bug: 29101595

1) Changing the font weight of the tabs to Medium
2) Changing the tab indicator color
3) Increasing the padding on the top and bottom of the entire suggestion
space (from 6dp to 8dp)
4) Balancing the space of list components within their perspective list
heights
5) Adjusting the padding on the right side to improve alignment
6) Changing "Suggestions" and suggestions counter font weight and size
7) Removing the drop shadow on the bottom of the suggestion space
8) "More help" subheader has been removed
9) Use 54% #000000 as tint color for more help icons.

Change-Id: If3e1c5ce2701422fba6185e7fa340abccc9bd30c
---
 res/drawable/ic_forum_24dp.xml                |  2 +-
 res/drawable/ic_help_24dp.xml                 |  2 +-
 res/drawable/ic_lightbulb_outline_24.xml      |  2 +-
 res/layout/dashboard_category.xml             |  3 +--
 res/layout/dashboard_spacer.xml               |  2 +-
 res/layout/dashboard_tile.xml                 |  3 +--
 res/layout/sliding_tab_indicator_view.xml     |  2 +-
 res/layout/sliding_tab_title_view.xml         |  1 +
 res/layout/suggestion_header.xml              |  9 ++++---
 res/layout/suggestion_tile.xml                | 20 ++++----------
 res/layout/support_item_subtitle.xml          | 27 -------------------
 res/values/strings.xml                        |  3 ---
 res/values/styles.xml                         |  6 +++++
 .../dashboard/SupportItemAdapter.java         |  4 ---
 14 files changed, 24 insertions(+), 62 deletions(-)
 delete mode 100644 res/layout/support_item_subtitle.xml

diff --git a/res/drawable/ic_forum_24dp.xml b/res/drawable/ic_forum_24dp.xml
index 34c086952e1..562c146452e 100644
--- a/res/drawable/ic_forum_24dp.xml
+++ b/res/drawable/ic_forum_24dp.xml
@@ -21,7 +21,7 @@
     android:height="24dp"
     android:viewportWidth="24.0"
     android:viewportHeight="24.0"
-    android:tint="?android:attr/colorAccent">
+    android:tint="?android:attr/colorControlNormal">
     <path
         android:fillColor="#FFFFFFFF"
         android:pathData="M21,6h-2v9H6v2c0,0.55 0.45,1 1,1h11l4,4V7c0,-0.55 -0.45,-1
diff --git a/res/drawable/ic_help_24dp.xml b/res/drawable/ic_help_24dp.xml
index 5fd1e79b28c..57c6ee821ff 100644
--- a/res/drawable/ic_help_24dp.xml
+++ b/res/drawable/ic_help_24dp.xml
@@ -21,7 +21,7 @@
     android:height="24dp"
     android:viewportWidth="24.0"
     android:viewportHeight="24.0"
-    android:tint="?android:attr/colorAccent">
+    android:tint="?android:attr/colorControlNormal">
     <path
         android:fillColor="#FFFFFFFF"
         android:pathData="M12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48
diff --git a/res/drawable/ic_lightbulb_outline_24.xml b/res/drawable/ic_lightbulb_outline_24.xml
index 89cf8fabc06..4590d43395c 100644
--- a/res/drawable/ic_lightbulb_outline_24.xml
+++ b/res/drawable/ic_lightbulb_outline_24.xml
@@ -20,7 +20,7 @@
     android:height="24dp"
     android:viewportWidth="24.0"
     android:viewportHeight="24.0"
-    android:tint="?android:attr/colorAccent">
+    android:tint="?android:attr/colorControlNormal">
     <path
         android:fillColor="#FF000000"
         android:pathData="M9,21c0,0.55 0.45,1 1,1h4c0.55,0 1,-0.45 1,-1v-1L9,20v1zM12,2C8.14,2
diff --git a/res/layout/dashboard_category.xml b/res/layout/dashboard_category.xml
index 7019a9c3195..b3500b2870b 100644
--- a/res/layout/dashboard_category.xml
+++ b/res/layout/dashboard_category.xml
@@ -21,8 +21,7 @@
     android:orientation="vertical"
     android:paddingBottom="8dip"
     android:background="@color/card_background"
-    android:importantForAccessibility="noHideDescendants"
-    android:elevation="@dimen/dashboard_category_elevation" >
+    android:importantForAccessibility="noHideDescendants">
 
     <TextView android:id="@android:id/title"
         android:layout_width="match_parent"
diff --git a/res/layout/dashboard_spacer.xml b/res/layout/dashboard_spacer.xml
index b26f1e5c927..8d58c80b36f 100644
--- a/res/layout/dashboard_spacer.xml
+++ b/res/layout/dashboard_spacer.xml
@@ -17,5 +17,5 @@
 <View
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="6dp"
+    android:layout_height="8dp"
     android:background="@color/card_background_grey"/>
diff --git a/res/layout/dashboard_tile.xml b/res/layout/dashboard_tile.xml
index a588ed4bbab..7a0cfbbc9da 100644
--- a/res/layout/dashboard_tile.xml
+++ b/res/layout/dashboard_tile.xml
@@ -23,8 +23,7 @@
     android:minHeight="@dimen/dashboard_tile_minimum_height"
     android:clickable="true"
     android:focusable="true"
-    android:background="@drawable/selectable_card"
-    android:elevation="@dimen/dashboard_category_elevation" >
+    android:background="@drawable/selectable_card">
 
     <ImageView
         android:id="@android:id/icon"
diff --git a/res/layout/sliding_tab_indicator_view.xml b/res/layout/sliding_tab_indicator_view.xml
index 9b2942f06e1..c5f61db571b 100644
--- a/res/layout/sliding_tab_indicator_view.xml
+++ b/res/layout/sliding_tab_indicator_view.xml
@@ -19,4 +19,4 @@
     android:id="@+id/sliding_tab_selected_indicator"
     android:layout_width="wrap_content"
     android:layout_height="@dimen/pager_tabs_selected_indicator_height"
-    android:background="?android:attr/colorAccent"/>
+    android:background="@color/accent_color_lighter"/>
diff --git a/res/layout/sliding_tab_title_view.xml b/res/layout/sliding_tab_title_view.xml
index 1a4328fd048..5df8378b7dc 100644
--- a/res/layout/sliding_tab_title_view.xml
+++ b/res/layout/sliding_tab_title_view.xml
@@ -22,6 +22,7 @@
     android:layout_height="wrap_content"
     android:background="?android:attr/selectableItemBackground"
     android:ellipsize="end"
+    android:fontFamily="sans-serif-medium"
     android:gravity="center"
     android:maxLines="1"
     android:padding="@dimen/pager_tabs_title_padding"
diff --git a/res/layout/suggestion_header.xml b/res/layout/suggestion_header.xml
index b30df60a87f..69ebedc65ca 100644
--- a/res/layout/suggestion_header.xml
+++ b/res/layout/suggestion_header.xml
@@ -22,7 +22,8 @@
     android:clickable="true"
     android:focusable="true"
     android:background="@drawable/selectable_card_grey"
-    android:gravity="center_vertical" >
+    android:gravity="center_vertical"
+    android:paddingTop="4dp">
     <ImageView
         android:id="@android:id/icon"
         android:layout_width="@dimen/dashboard_tile_image_size"
@@ -35,7 +36,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:singleLine="true"
-        android:textAppearance="@style/TextAppearance.TileTitle"
+        android:textAppearance="@style/TextAppearance.SuggestionTitle"
         android:textColor="?android:attr/colorAccent"
         android:ellipsize="marquee"
         android:fadingEdge="horizontal"/>
@@ -45,7 +46,7 @@
         android:layout_height="wrap_content"
         android:layout_weight="1"
         android:gravity="end"
-        android:paddingEnd="16dp"
-        android:textAppearance="@style/TextAppearance.TileTitle"
+        android:paddingEnd="20dp"
+        android:textAppearance="@style/TextAppearance.SuggestionTitle"
         android:textColor="?android:attr/colorAccent"/>
 </LinearLayout>
diff --git a/res/layout/suggestion_tile.xml b/res/layout/suggestion_tile.xml
index 9ffd4556e44..80de8ff4937 100644
--- a/res/layout/suggestion_tile.xml
+++ b/res/layout/suggestion_tile.xml
@@ -55,21 +55,11 @@
 
     </RelativeLayout>
 
-    <FrameLayout
+    <ImageView
+        android:id="@+id/overflow"
+        style="?android:attr/actionOverflowButtonStyle"
         android:layout_width="wrap_content"
-        android:layout_height="match_parent">
-
-        <ImageView
-            android:id="@+id/overflow"
-            style="?android:attr/actionOverflowButtonStyle"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:paddingStart="16dp"
-            android:paddingTop="16dp"
-            android:paddingEnd="18dp"
-            android:paddingBottom="16dp"
-            android:gravity="top"/>
-
-    </FrameLayout>
+        android:layout_height="wrap_content"
+        android:padding="16dp"/>
 
 </LinearLayout>
\ No newline at end of file
diff --git a/res/layout/support_item_subtitle.xml b/res/layout/support_item_subtitle.xml
deleted file mode 100644
index d4a528a8706..00000000000
--- a/res/layout/support_item_subtitle.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-     Copyright (C) 2016 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.
--->
-
-<TextView
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@android:id/text1"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:paddingBottom="16dp"
-    android:paddingEnd="8dp"
-    android:paddingStart="8dp"
-    android:paddingTop="8dp"
-    android:textAppearance="@style/TextAppearance.CategoryTitle"/>
\ No newline at end of file
diff --git a/res/values/strings.xml b/res/values/strings.xml
index a5142e6a075..52b54f31a76 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -7515,9 +7515,6 @@
     <!-- Summary text telling user to connect to Internet in order to request customer support. [CHAR LIMIT=NONE]-->
     <string name="support_offline_summary">To reach support, first connect to Wi-Fi or data.</string>
 
-    <!-- Title text for showing a list of help options [CHAR LIMIT=80]-->
-    <string name="support_more_help_title">More help</string>
-
     <!-- Button label for contacting customer support by phone [CHAR LIMIT=20]-->
     <string name="support_escalation_by_phone">Support call</string>
 
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 24d7905b884..8915c49cbac 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -333,6 +333,12 @@
     <style name="TextAppearance.RecentsTitle" parent="TextAppearance.CategoryTitle" />
     <style name="TextAppearance.ResultTitle" parent="TextAppearance.CategoryTitle" />
 
+    <style name="TextAppearance.SuggestionTitle"
+           parent="@android:style/TextAppearance.Material.Subhead">
+        <item name="android:fontFamily">sans-serif-medium</item>
+        <item name="android:textSize">14sp</item>
+    </style>
+
     <style name="TextAppearance.FingerprintMessage"
         parent="android:TextAppearance.Material.Subhead">
         <item name="android:lineSpacingExtra">@dimen/suw_description_line_spacing_extra</item>
diff --git a/src/com/android/settings/dashboard/SupportItemAdapter.java b/src/com/android/settings/dashboard/SupportItemAdapter.java
index 4956464d5fb..9dddc6a7a0d 100644
--- a/src/com/android/settings/dashboard/SupportItemAdapter.java
+++ b/src/com/android/settings/dashboard/SupportItemAdapter.java
@@ -46,7 +46,6 @@ import static com.android.settings.overlay.SupportFeatureProvider.SupportType.PH
 public final class SupportItemAdapter extends RecyclerView.Adapter<SupportItemAdapter.ViewHolder> {
 
     private static final int TYPE_TITLE = R.layout.support_item_title;
-    private static final int TYPE_SUBTITLE = R.layout.support_item_subtitle;
     private static final int TYPE_ESCALATION_OPTIONS = R.layout.support_escalation_options;
     private static final int TYPE_SUPPORT_TILE = R.layout.support_tile;
     private static final int TYPE_SIGN_IN_BUTTON = R.layout.support_sign_in_button;
@@ -182,9 +181,6 @@ public final class SupportItemAdapter extends RecyclerView.Adapter<SupportItemAd
     }
 
     private void addMoreHelpItems() {
-        mSupportData.add(new SupportData.Builder(TYPE_SUBTITLE)
-                .setText1(R.string.support_more_help_title)
-                .build());
         mSupportData.add(new SupportData.Builder(TYPE_SUPPORT_TILE)
                 .setIcon(R.drawable.ic_forum_24dp)
                 .setText1(R.string.support_forum_title)