commit d4cde838ea2bc23679e8656d04ed096e82d938d4
author Andrew Lee <anwlee@google.com> Fri May 16 15:56:48 2014 -0700
committer Andrew Lee <anwlee@google.com> Sat May 17 14:59:32 2014 -0700
tree fadf9eddb9191e7f008f29e61ca1d504eb97b7c4
parent 0d68dad4e0fde69e1a1e85efc19840363f4f9539

Add magnifying glass to search box.

Bug: 14900155
Change-Id: I12cf9aa36c7947e7ee8078de088882b2b3fbdae6

res/layout/search_edittext.xml

diff --git a/res/layout/search_edittext.xml b/res/layout/search_edittext.xml
index a20935f..d18754a 100644
--- a/res/layout/search_edittext.xml
+++ b/res/layout/search_edittext.xml
@@ -14,6 +14,13 @@
     android:background="@drawable/search_bg"
     android:gravity="center_vertical"
     >
+    <ImageView
+        android:id="@+id/search_magnifying_glass"
+        android:layout_height="@dimen/search_box_icon_size"
+        android:layout_width="@dimen/search_box_icon_size"
+        android:layout_margin="@dimen/search_box_icon_margin"
+        android:padding="@dimen/search_box_search_icon_padding"
+        android:src="@drawable/ic_ab_search" />
     <EditText
         android:id="@+id/search_view"
         android:layout_width="0dp"
@@ -30,7 +37,7 @@
         android:id="@+id/search_close_button"
         android:layout_height="@dimen/search_box_icon_size"
         android:layout_width="@dimen/search_box_icon_size"
-        android:padding="6dp"
+        android:layout_margin="@dimen/search_box_icon_margin"
         android:src="@drawable/ic_close_dk"
         android:clickable="true"
         android:background="?android:attr/selectableItemBackground"
@@ -40,7 +47,7 @@
         android:id="@+id/voice_search_button"
         android:layout_height="@dimen/search_box_icon_size"
         android:layout_width="@dimen/search_box_icon_size"
-        android:padding="@dimen/search_box_icon_padding"
+        android:layout_margin="@dimen/search_box_icon_margin"
         android:src="@drawable/ic_voice_search"
         android:clickable="true"
         android:contentDescription="@string/description_start_voice_search"
@@ -49,7 +56,7 @@
         android:id="@+id/dialtacts_options_menu_button"
         android:layout_width="@dimen/search_box_icon_size"
         android:layout_height="@dimen/search_box_icon_size"
-        android:padding="@dimen/search_box_icon_padding"
+        android:layout_margin="@dimen/search_box_icon_margin"
         android:background="?android:attr/selectableItemBackground"
         android:src="@drawable/ic_overflow_menu"
         android:tint="@color/searchbox_options_menu_color" />