From a22768cc1e1239f0eb361bf8b6409c925dfcf156 Mon Sep 17 00:00:00 2001
From: Andrew Sapperstein <asapperstein@google.com>
Date: Thu, 6 Jul 2017 16:34:58 -0700
Subject: [PATCH] Search bar polish

Updated main page text color, text size, and search bar height.
Also updated results page text size.

Change-Id: Ic4a390136b854741a73e99431b8dd9452871dd2c
Fixes: 63397599
Fixes: 63394285
Test: robotests and manual
---
 res/layout/search_panel.xml                         | 2 +-
 res/layout/settings_main_dashboard.xml              | 5 +++--
 res/values-sw600dp/dimens.xml                       | 2 ++
 res/values/dimens.xml                               | 3 +++
 res/values/styles.xml                               | 4 ++++
 src/com/android/settings/search/SearchFragment.java | 7 ++++++-
 6 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/res/layout/search_panel.xml b/res/layout/search_panel.xml
index 7461374444b..0a3d952bed5 100644
--- a/res/layout/search_panel.xml
+++ b/res/layout/search_panel.xml
@@ -36,7 +36,7 @@
             <Toolbar
                 android:id="@+id/search_toolbar"
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content"
+                android:layout_height="@dimen/search_bar_height"
                 android:background="?android:attr/selectableItemBackground"
                 android:contentInsetStart="0dp"
                 android:contentInsetStartWithNavigation="0dp"
diff --git a/res/layout/settings_main_dashboard.xml b/res/layout/settings_main_dashboard.xml
index 189c7329e5d..86abe51f984 100644
--- a/res/layout/settings_main_dashboard.xml
+++ b/res/layout/settings_main_dashboard.xml
@@ -37,11 +37,12 @@
             <Toolbar
                 android:id="@+id/search_action_bar"
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content"
+                android:layout_height="@dimen/search_bar_height"
                 android:background="?android:attr/selectableItemBackground"
                 android:contentInsetStartWithNavigation="64dp"
                 android:navigationIcon="@drawable/ic_search_24dp"
-                android:titleTextColor="@*android:color/text_color_primary"
+                android:title="@string/search_menu"
+                android:titleTextAppearance="@style/TextAppearance.SearchBar"
                 android:theme="?android:attr/actionBarTheme"/>
         </android.support.v7.widget.CardView>
     </FrameLayout>
diff --git a/res/values-sw600dp/dimens.xml b/res/values-sw600dp/dimens.xml
index 0157fa23926..041191467fe 100755
--- a/res/values-sw600dp/dimens.xml
+++ b/res/values-sw600dp/dimens.xml
@@ -66,6 +66,8 @@
     <dimen name="search_result_item_image_margin_start">24dp</dimen>
     <dimen name="search_result_item_image_margin_end">32dp</dimen>
 
+    <dimen name="search_bar_height">64dp</dimen>
+
     <!-- Dimensions for Wifi Assistant Card -->
     <dimen name="wifi_assistant_padding_top_bottom">24dp</dimen>
     <dimen name="wifi_assistant_padding_start_end">24dp</dimen>
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index 1af83956be2..70417e5c3ca 100755
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -145,6 +145,9 @@
     <dimen name="search_bar_margin">8dp</dimen>
     <dimen name="search_bar_negative_margin">-8dp</dimen>
 
+    <dimen name="search_bar_height">48dp</dimen>
+    <dimen name="search_bar_text_size">16dp</dimen>
+
     <!-- Dimensions for Wifi Assistant Card -->
     <dimen name="wifi_assistant_padding_top_bottom">16dp</dimen>
     <dimen name="wifi_assistant_padding_start_end">16dp</dimen>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 398bdbd1544..35810efdef8 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -458,4 +458,8 @@
         <item name="android:background">@color/material_grey_300</item>
     </style>
 
+    <style name="TextAppearance.SearchBar" parent="@android:style/TextAppearance.Material.Widget.Toolbar.Subtitle">
+        <item name="android:textSize">@dimen/search_bar_text_size</item>
+    </style>
+
 </resources>
diff --git a/src/com/android/settings/search/SearchFragment.java b/src/com/android/settings/search/SearchFragment.java
index aec140aeb15..7ceec621fa7 100644
--- a/src/com/android/settings/search/SearchFragment.java
+++ b/src/com/android/settings/search/SearchFragment.java
@@ -30,6 +30,7 @@ import android.support.v7.widget.RecyclerView;
 import android.text.TextUtils;
 import android.util.Log;
 import android.util.Pair;
+import android.util.TypedValue;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -187,8 +188,12 @@ public class SearchFragment extends InstrumentedFragment implements SearchView.O
         // check. This ensures if we return, say, a LinearLayout in the tests, they won't fail.
         View searchText = mSearchView.findViewById(com.android.internal.R.id.search_src_text);
         if (searchText instanceof TextView) {
-            ((TextView) searchText).setTextColor(getContext().getColorStateList(
+            TextView searchTextView = (TextView) searchText;
+            searchTextView.setTextColor(getContext().getColorStateList(
                     com.android.internal.R.color.text_color_primary));
+            searchTextView.setTextSize(TypedValue.COMPLEX_UNIT_PX,
+                    getResources().getDimension(R.dimen.search_bar_text_size));
+
         }
         View editFrame = mSearchView.findViewById(com.android.internal.R.id.search_edit_frame);
         if (editFrame != null) {