diff options
| author | Andrew Lee <anwlee@google.com> | 2014-05-16 15:56:48 -0700 |
|---|---|---|
| committer | Andrew Lee <anwlee@google.com> | 2014-05-17 14:59:32 -0700 |
| commit | d4cde838ea2bc23679e8656d04ed096e82d938d4 (patch) | |
| tree | fadf9eddb9191e7f008f29e61ca1d504eb97b7c4 /res | |
| parent | 0d68dad4e0fde69e1a1e85efc19840363f4f9539 (diff) | |
Add magnifying glass to search box.
Bug: 14900155
Change-Id: I12cf9aa36c7947e7ee8078de088882b2b3fbdae6
Diffstat (limited to 'res')
| -rw-r--r-- | res/layout/search_edittext.xml | 13 | ||||
| -rw-r--r-- | res/values/dimens.xml | 7 |
2 files changed, 14 insertions, 6 deletions
diff --git a/res/layout/search_edittext.xml b/res/layout/search_edittext.xml index a20935f30..d18754aee 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" /> diff --git a/res/values/dimens.xml b/res/values/dimens.xml index 93b98ef94..8ceda625d 100644 --- a/res/values/dimens.xml +++ b/res/values/dimens.xml @@ -101,15 +101,16 @@ <!-- Search box text size --> <dimen name="search_text_size">13.24sp</dimen> <!-- Search box interior padding - left --> - <dimen name="search_box_left_padding">16dp</dimen> + <dimen name="search_box_left_padding">8dp</dimen> <!-- Search box interior padding - right --> <dimen name="search_box_right_padding">8dp</dimen> <!-- Padding around the icon in the search box. --> - <dimen name="search_box_icon_padding">3dp</dimen> + <dimen name="search_box_icon_margin">4dp</dimen> + <dimen name="search_box_search_icon_padding">4dp</dimen> <!-- Left margin of the text field in the search box. --> <dimen name="search_box_text_left_margin">8dp</dimen> <!-- Size of the icon (voice search, close search) in the search box. --> - <dimen name="search_box_icon_size">37dp</dimen> + <dimen name="search_box_icon_size">28dp</dimen> <!-- Size of text in tabs. --> <dimen name="tab_height">43dp</dimen> |