From 5b3332547aa9237b6f1e2a266799ee586ff5b1ec Mon Sep 17 00:00:00 2001
From: Doris Ling <dling@google.com>
Date: Tue, 20 Feb 2018 15:30:47 -0800
Subject: [PATCH] Update suggestion/condition UI

- reduce top padding for suggestion container
- match condition card corner radius with suggestion card.
- change condition card background color to white
- update suggestion title font from medium to regular.

Change-Id: I0267b37822facf4bd389e2b21c47a1fcf0d00264
Fixes: 70573674
Test: visual
---
 res/layout/condition_container.xml                            | 4 ++--
 res/layout/condition_tile.xml                                 | 1 -
 res/layout/suggestion_container.xml                           | 2 +-
 .../settings/dashboard/suggestions/SuggestionAdapter.java     | 2 +-
 4 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/res/layout/condition_container.xml b/res/layout/condition_container.xml
index 808c4ac51a5..dd91bbb8d49 100644
--- a/res/layout/condition_container.xml
+++ b/res/layout/condition_container.xml
@@ -30,13 +30,13 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:cardUseCompatPadding="true"
-        app:cardElevation="2dp">
+        app:cardElevation="2dp"
+        app:cardCornerRadius="@dimen/suggestion_card_corner_radius">
 
         <android.support.v7.widget.RecyclerView
             android:id="@+id/data"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:background="@color/material_grey_300"
             android:scrollbars="none"/>
 
     </android.support.v7.widget.CardView>
diff --git a/res/layout/condition_tile.xml b/res/layout/condition_tile.xml
index 7d1db409c70..a31274fada6 100644
--- a/res/layout/condition_tile.xml
+++ b/res/layout/condition_tile.xml
@@ -19,7 +19,6 @@
     android:id="@+id/content"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:background="@color/condition_card_background"
     android:orientation="vertical">
 
     <LinearLayout
diff --git a/res/layout/suggestion_container.xml b/res/layout/suggestion_container.xml
index 409f39e18c5..95a00cca1c9 100644
--- a/res/layout/suggestion_container.xml
+++ b/res/layout/suggestion_container.xml
@@ -20,7 +20,7 @@
     style="@style/SuggestionConditionStyle"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:paddingTop="10dp"
+    android:paddingTop="2dp"
     android:orientation="vertical">
 
     <LinearLayout
diff --git a/src/com/android/settings/dashboard/suggestions/SuggestionAdapter.java b/src/com/android/settings/dashboard/suggestions/SuggestionAdapter.java
index b24a9146574..11eb80c6ae8 100644
--- a/src/com/android/settings/dashboard/suggestions/SuggestionAdapter.java
+++ b/src/com/android/settings/dashboard/suggestions/SuggestionAdapter.java
@@ -127,7 +127,7 @@ public class SuggestionAdapter extends RecyclerView.Adapter<DashboardItemHolder>
         holder.title.setText(suggestion.getTitle());
         holder.title.setSingleLine(suggestionCount == 1);
         holder.title.setTypeface(Typeface.create(
-            mContext.getString(com.android.internal.R.string.config_headlineFontFamilyMedium),
+            mContext.getString(com.android.internal.R.string.config_headlineFontFamily),
             Typeface.NORMAL));
 
         if (suggestionCount == 1) {