From 6bc46129b93069868d2425fb9d9c50e1dabe6502 Mon Sep 17 00:00:00 2001
From: calderwoodra <calderwoodra@google.com>
Date: Tue, 20 Feb 2018 16:14:22 -0800
Subject: Fixed some issues in NUI search bar.

 - search bar is now the correct height
 - search bar hint now updates for Google Dialer
 - search bar now properly slides up when in dialpad search

Bug: 72525324
Test: GoogleMainActivityOldPeerIntegrationTest
PiperOrigin-RevId: 186379302
Change-Id: If5ad570c89c6a784fa17df422d88e68c30356712
---
 .../dialer/main/impl/toolbar/res/layout/expanded_search_bar.xml  | 2 +-
 .../dialer/main/impl/toolbar/res/layout/toolbar_layout.xml       | 9 +++++----
 2 files changed, 6 insertions(+), 5 deletions(-)

(limited to 'java/com/android/dialer/main/impl/toolbar/res/layout')

diff --git a/java/com/android/dialer/main/impl/toolbar/res/layout/expanded_search_bar.xml b/java/com/android/dialer/main/impl/toolbar/res/layout/expanded_search_bar.xml
index 4e49accae..3bd71b63a 100644
--- a/java/com/android/dialer/main/impl/toolbar/res/layout/expanded_search_bar.xml
+++ b/java/com/android/dialer/main/impl/toolbar/res/layout/expanded_search_bar.xml
@@ -17,7 +17,7 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/search_box_expanded"
     android:layout_width="match_parent"
-    android:layout_height="wrap_content"
+    android:layout_height="@dimen/expanded_search_bar_height"
     android:visibility="invisible">
 
   <ImageButton
diff --git a/java/com/android/dialer/main/impl/toolbar/res/layout/toolbar_layout.xml b/java/com/android/dialer/main/impl/toolbar/res/layout/toolbar_layout.xml
index 59cc35451..378b20f47 100644
--- a/java/com/android/dialer/main/impl/toolbar/res/layout/toolbar_layout.xml
+++ b/java/com/android/dialer/main/impl/toolbar/res/layout/toolbar_layout.xml
@@ -17,7 +17,7 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
-    android:layout_height="?attr/actionBarSize"
+    android:layout_height="@dimen/expanded_search_bar_height"
     android:background="@color/dialer_theme_color"
     app:contentInsetStart="0dp"
     app:contentInsetEnd="0dp">
@@ -27,6 +27,7 @@
       android:layout_width="match_parent"
       android:layout_height="wrap_content"
       android:layout_margin="@dimen/search_bar_margin"
+      android:minHeight="@dimen/collapsed_search_bar_height"
       android:background="@drawable/rounded_corner"
       android:elevation="4dp">
 
@@ -58,8 +59,8 @@
           android:layout_marginStart="8dp"
           android:layout_centerVertical="true"
           android:fontFamily="sans-serif"
-          android:hint="@string/dialer_hint_find_contact"
-          android:textColorHint="@color/dialer_secondary_text_color"
+          android:text="@string/dialer_hint_find_contact"
+          android:textColor="@color/dialer_secondary_text_color"
           android:textSize="16dp"/>
 
       <ImageView
@@ -128,4 +129,4 @@
           android:textSize="16sp"/>
     </LinearLayout>
   </com.android.dialer.app.list.RemoveView>
-</com.android.dialer.main.impl.toolbar.MainToolbar>
\ No newline at end of file
+</com.android.dialer.main.impl.toolbar.MainToolbar>
-- 
cgit v1.2.3