Adjusted layout dimensions in new search UI.

screenshots:
default:    http://screen/qEdB51A3PDn
zero-query: http://screen/qEBDg0auGA8
query:      http://screen/SuLp2GwyvYr
Bug: 64806278
Test: manual
PiperOrigin-RevId: 167205946
Change-Id: I07563fd23801da8d9d2eb95f6d09a079474403eb

3 files changed, 15 insertions, 13 deletions

diff --git a/java/com/android/contacts/common/res/layout/search_bar_expanded.xml b/java/com/android/contacts/common/res/layout/search_bar_expanded.xml
index 7192eb030..f0179ad30 100644
--- a/java/com/android/contacts/common/res/layout/search_bar_expanded.xml
+++ b/java/com/android/contacts/common/res/layout/search_bar_expanded.xml
@@ -13,20 +13,19 @@
      See the License for the specific language governing permissions and
      limitations under the License.
 -->
-<LinearLayout
+<RelativeLayout
   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:gravity="center_vertical"
-  android:orientation="horizontal"
   android:visibility="gone">
 
   <ImageButton
     android:id="@+id/search_back_button"
     android:layout_width="@dimen/search_box_icon_size"
     android:layout_height="@dimen/search_box_icon_size"
-    android:layout_margin="@dimen/search_box_navigation_icon_margin"
+    android:layout_marginStart="16dp"
+    android:layout_centerVertical="true"
     android:background="?attr/selectableItemBackgroundBorderless"
     android:contentDescription="@string/action_menu_back_from_search"
     android:src="@drawable/quantum_ic_arrow_back_vd_theme_24"
@@ -34,15 +33,17 @@
 
   <EditText
     android:id="@+id/search_view"
-    android:layout_width="0dp"
-    android:layout_height="@dimen/search_box_icon_size"
-    android:layout_weight="1"
-    android:layout_marginLeft="@dimen/search_box_text_left_margin"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:layout_toEndOf="@+id/search_back_button"
+    android:layout_toStartOf="@+id/search_close_button"
+    android:layout_centerVertical="true"
+    android:layout_marginStart="8dp"
     android:background="@null"
     android:fontFamily="@string/search_font_family"
     android:imeOptions="flagNoExtractUi"
     android:inputType="textFilter"
-    android:singleLine="true"
+    android:maxLines="1"
     android:textColor="@color/searchbox_text_color"
     android:textColorHint="@color/searchbox_hint_text_color"
     android:textCursorDrawable="@drawable/searchedittext_custom_cursor"
@@ -52,11 +53,12 @@
     android:id="@+id/search_close_button"
     android:layout_width="@dimen/search_box_close_icon_size"
     android:layout_height="@dimen/search_box_close_icon_size"
+    android:layout_alignParentEnd="true"
+    android:layout_centerVertical="true"
     android:padding="@dimen/search_box_close_icon_padding"
     android:background="?attr/selectableItemBackgroundBorderless"
     android:clickable="true"
     android:contentDescription="@string/description_clear_search"
     android:src="@drawable/quantum_ic_close_vd_theme_24"
     android:tint="@color/searchbox_icon_tint"/>
-
-</LinearLayout>
+</RelativeLayout>
diff --git a/java/com/android/contacts/common/res/values/colors.xml b/java/com/android/contacts/common/res/values/colors.xml
index 1f46233c4..3044339fd 100644
--- a/java/com/android/contacts/common/res/values/colors.xml
+++ b/java/com/android/contacts/common/res/values/colors.xml
@@ -68,7 +68,7 @@
   <color name="actionbar_unselected_text_color">#a6ffffff</color>
 
   <!-- Text color of the search box text as entered by user  -->
-  <color name="searchbox_text_color">#000000</color>
+  <color name="searchbox_text_color">@color/dialer_primary_text_color</color>
   <!-- Background color of the search box -->
   <color name="searchbox_background_color">#ffffff</color>
 
diff --git a/java/com/android/contacts/common/res/values/dimens.xml b/java/com/android/contacts/common/res/values/dimens.xml
index 19b27b8c6..1ad9b30b0 100644
--- a/java/com/android/contacts/common/res/values/dimens.xml
+++ b/java/com/android/contacts/common/res/values/dimens.xml
@@ -80,7 +80,7 @@
   <!-- Left margin of the text field in the search box. -->
   <dimen name="search_box_text_left_margin">15dp</dimen>
   <!-- Search box text size -->
-  <dimen name="search_text_size">20sp</dimen>
+  <dimen name="search_text_size">16sp</dimen>
 
   <dimen name="contact_list_card_elevation">2dp</dimen>