From aa280fa887ee877e6faff55ce3c1c406f113d559 Mon Sep 17 00:00:00 2001
From: calderwoodra <calderwoodra@google.com>
Date: Fri, 12 Jan 2018 11:37:47 -0800
Subject: Added search bar animations to NUI toolbar.

Bug: 181512198
Test: MainActivityIntegrationTest
PiperOrigin-RevId: 181771027
Change-Id: Id2b6d35cec928cbd2fed8ad75a9da007af9e826e
---
 .../main/impl/toolbar/res/layout/expanded_search_bar.xml    | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

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

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 f814a766d..4dbd4bf22 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,14 +17,14 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/search_box_expanded"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:visibility="gone">
+    android:layout_height="wrap_content"
+    android:visibility="invisible">
 
   <ImageButton
       android:id="@+id/search_back_button"
       android:layout_width="48dp"
       android:layout_height="48dp"
-      android:layout_marginStart="16dp"
+      android:layout_marginStart="8dp"
       android:layout_centerVertical="true"
       android:background="?attr/selectableItemBackgroundBorderless"
       android:contentDescription="@string/action_menu_back_from_search"
@@ -39,17 +39,19 @@
       android:layout_toStartOf="@+id/search_close_button"
       android:layout_centerVertical="true"
       android:layout_marginStart="8dp"
+      android:minHeight="48dp"
       android:background="@null"
       android:imeOptions="flagNoExtractUi"
       android:inputType="textFilter"
       android:maxLines="1"
+      android:hint="@string/dialer_hint_find_contact"
       android:textColor="@color/dialer_secondary_text_color"
       android:textColorHint="@color/dialer_edit_text_hint_color"
       android:textCursorDrawable="@drawable/custom_cursor"
       android:textSize="16sp"/>
 
   <ImageView
-      android:id="@+id/search_close_button"
+      android:id="@+id/search_clear_button"
       android:layout_width="48dp"
       android:layout_height="48dp"
       android:layout_alignParentEnd="true"
@@ -58,5 +60,6 @@
       android:background="?attr/selectableItemBackgroundBorderless"
       android:contentDescription="@string/description_clear_search"
       android:src="@drawable/quantum_ic_close_vd_theme_24"
-      android:tint="@color/dialer_secondary_text_color"/>
+      android:tint="@color/dialer_secondary_text_color"
+      android:visibility="gone"/>
 </RelativeLayout>
\ No newline at end of file
-- 
cgit v1.2.3