Merge \"Support tab UI polish.\" into nyc-mr1-dev

am: cac9227e16

Change-Id: I64062459148a6fd38f223eef92cc1680e38423c9

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

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

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

res/layout/dashboard_category.xml

@@ -21,8 +21,7 @@
     android:orientation="vertical"
     android:paddingBottom="8dip"
     android:background="@color/card_background"
-    android:importantForAccessibility="noHideDescendants"
+    android:importantForAccessibility="noHideDescendants">
-    android:elevation="@dimen/dashboard_category_elevation" >
 
     <TextView android:id="@android:id/title"
         android:layout_width="match_parent"

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"/>

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:background="@drawable/selectable_card">
-    android:elevation="@dimen/dashboard_category_elevation" >
 
     <ImageView
         android:id="@android:id/icon"

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"/>

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"

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:paddingEnd="20dp"
-        android:textAppearance="@style/TextAppearance.TileTitle"
+        android:textAppearance="@style/TextAppearance.SuggestionTitle"
         android:textColor="?android:attr/colorAccent"/>
 </LinearLayout>

res/layout/suggestion_tile.xml

@@ -55,21 +55,11 @@
 
     </RelativeLayout>
 
-    <FrameLayout
-        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:padding="16dp"/>
-            android:paddingTop="16dp"
-            android:paddingEnd="18dp"
-            android:paddingBottom="16dp"
-            android:gravity="top"/>
-
-    </FrameLayout>
 
 </LinearLayout>

res/layout/support_item_subtitle.xml

@@ -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"/>

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>
 

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>

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)