Merge "Tidy up search ripples/layout." into mnc-dev
diff --git a/res/layout/search_edittext.xml b/res/layout/search_edittext.xml
index 93a3c75..61406a1 100644
--- a/res/layout/search_edittext.xml
+++ b/res/layout/search_edittext.xml
@@ -19,7 +19,7 @@
android:paddingStart="@dimen/search_box_left_padding"
android:paddingEnd="@dimen/search_box_right_padding"
android:gravity="center_vertical"
- android:orientation="horizontal" >
+ android:orientation="horizontal">
<ImageView
android:id="@+id/search_magnifying_glass"
@@ -28,29 +28,20 @@
android:layout_margin="@dimen/search_box_icon_margin"
android:padding="@dimen/search_box_search_icon_padding"
android:src="@drawable/ic_ab_search"
- android:background="?android:attr/selectableItemBackgroundBorderless"
android:importantForAccessibility="no"
android:tint="@color/searchbox_icon_tint" />
- <!-- Portion of the search box that starts a search when clicked -->
- <LinearLayout
+ <TextView
android:id="@+id/search_box_start_search"
android:layout_height="wrap_content"
android:layout_width="0dp"
android:layout_weight="1"
- android:gravity="center_vertical" >
-
- <TextView
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_marginLeft="@dimen/search_box_collapsed_text_margin_left"
- android:textSize="@dimen/search_collapsed_text_size"
- android:fontFamily="@string/search_font_family"
- android:textColorHint="@color/searchbox_hint_text_color"
- android:gravity="center_vertical"
- android:hint="@string/dialer_hint_find_contact" />
-
- </LinearLayout>
+ android:layout_marginLeft="@dimen/search_box_collapsed_text_margin_left"
+ android:textSize="@dimen/search_collapsed_text_size"
+ android:fontFamily="@string/search_font_family"
+ android:textColorHint="@color/searchbox_hint_text_color"
+ android:gravity="center_vertical"
+ android:hint="@string/dialer_hint_find_contact" />
<ImageView
android:id="@+id/voice_search_button"
@@ -60,16 +51,15 @@
android:src="@drawable/ic_voice_search"
android:clickable="true"
android:contentDescription="@string/description_start_voice_search"
- android:background="?android:attr/selectableItemBackground"
+ android:background="?android:attr/selectableItemBackgroundBorderless"
android:tint="@color/searchbox_icon_tint" />
-
<ImageButton
android:id="@+id/dialtacts_options_menu_button"
android:layout_width="@dimen/search_box_icon_size"
android:layout_height="@dimen/search_box_icon_size"
android:layout_margin="@dimen/search_box_icon_margin"
- android:background="?android:attr/selectableItemBackground"
+ android:background="?android:attr/selectableItemBackgroundBorderless"
android:src="@drawable/ic_overflow_menu"
android:contentDescription="@string/action_menu_overflow_description"
android:tint="@color/searchbox_icon_tint" />