Merge "Update search bar specs" into pi-car-dev
diff --git a/res/layout/search_bar.xml b/res/layout/search_bar.xml
index 804ec59..1c8d55f 100644
--- a/res/layout/search_bar.xml
+++ b/res/layout/search_bar.xml
@@ -32,10 +32,12 @@
android:id="@+id/search_bar"
android:layout_height="match_parent"
android:layout_width="match_parent"
- android:paddingLeft="@dimen/appbar_view_icon_touch_target_size"
- android:layout_marginLeft="@dimen/appbar_view_search_margin"
+ android:paddingStart="@dimen/appbar_view_search_bar_padding"
+ android:layout_marginStart="@dimen/appbar_view_search_margin"
android:hint="@string/search_hint"
android:textColorHint="@color/search_hint_text_color"
+ android:textCursorDrawable="@null"
+ android:backgroundTint="@color/search_bar_underline_color"
android:inputType="text"
android:singleLine="true"
android:imeOptions="actionDone"
@@ -45,7 +47,7 @@
android:id="@+id/search_close"
android:layout_width="@dimen/appbar_view_icon_touch_target_size"
android:layout_height="@dimen/appbar_view_icon_touch_target_size"
- android:layout_marginLeft="@dimen/appbar_view_search_margin"
+ android:layout_marginStart="@dimen/appbar_view_search_margin"
android:padding="@dimen/appbar_view_icon_padding"
android:background="@drawable/appbar_view_icon_background"
android:visibility="gone"
diff --git a/res/values/colors.xml b/res/values/colors.xml
index d7a6046..aacd66c 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -50,4 +50,7 @@
<!-- fragment_error.xml -->
<color name="error_button_text_color">@color/uxr_button_text_color_selector</color>
+
+ <!-- Color used for the search bar underline -->
+ <color name="search_bar_underline_color">@android:color/white</color>
</resources>
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index 429114d..4229bf7 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -78,8 +78,6 @@
<dimen name="appbar_view_control_buttons_spacing">@*android:dimen/car_padding_3</dimen>
<dimen name="appbar_view_control_buttons_margin_end">@*android:dimen/car_padding_2</dimen>
<dimen name="appbar_view_title_margin_start">@*android:dimen/car_padding_2</dimen>
- <!-- negative margin to overlap icons on search bar -->
- <dimen name="appbar_view_search_margin">-96dp</dimen>
<!-- browse_state.xml -->
<dimen name="browse_state_progress_height">@*android:dimen/car_double_line_list_item_height
