diff options
Diffstat (limited to 'java/com/android/dialer/app/res')
| -rw-r--r-- | java/com/android/dialer/app/res/layout/search_edittext.xml | 36 | ||||
| -rw-r--r-- | java/com/android/dialer/app/res/values/dimens.xml | 6 |
2 files changed, 26 insertions, 16 deletions
diff --git a/java/com/android/dialer/app/res/layout/search_edittext.xml b/java/com/android/dialer/app/res/layout/search_edittext.xml index bb6a5f7de..63786dfb0 100644 --- a/java/com/android/dialer/app/res/layout/search_edittext.xml +++ b/java/com/android/dialer/app/res/layout/search_edittext.xml @@ -1,4 +1,18 @@ <?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2017 The Android Open Source Project + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +--> <view xmlns:android="http://schemas.android.com/apk/res/android" android:id="@+id/search_view_container" class="com.android.dialer.app.widget.SearchEditTextLayout" @@ -13,20 +27,18 @@ android:theme="@style/DialtactsSearchBarThemeOverlay" android:orientation="horizontal"> - <LinearLayout + <RelativeLayout android:id="@+id/search_box_collapsed" android:layout_width="match_parent" android:layout_height="match_parent" android:background="?android:selectableItemBackground" - android:paddingStart="@dimen/search_box_left_padding" - android:gravity="center_vertical" - android:orientation="horizontal"> + android:gravity="center_vertical"> <ImageView android:id="@+id/search_magnifying_glass" android:layout_width="@dimen/search_box_icon_size" android:layout_height="@dimen/search_box_icon_size" - android:padding="@dimen/search_box_search_icon_padding" + android:layout_marginStart="8dp" android:importantForAccessibility="no" android:scaleType="center" android:src="@drawable/quantum_ic_search_vd_theme_24" @@ -34,10 +46,11 @@ <TextView android:id="@+id/search_box_start_search" - android:layout_width="0dp" + android:layout_width="wrap_content" android:layout_height="match_parent" - android:layout_weight="1" - android:layout_marginLeft="@dimen/search_box_collapsed_text_margin_left" + android:layout_toEndOf="@+id/search_magnifying_glass" + android:layout_toStartOf="@+id/voice_search_button" + android:layout_marginStart="8dp" android:fontFamily="@string/search_font_family" android:gravity="center_vertical" android:hint="@string/dialer_hint_find_contact" @@ -48,6 +61,7 @@ android:id="@+id/voice_search_button" android:layout_width="@dimen/search_box_icon_size" android:layout_height="match_parent" + android:layout_toStartOf="@+id/dialtacts_options_menu_button" android:background="?android:attr/selectableItemBackgroundBorderless" android:clickable="true" android:contentDescription="@string/description_start_voice_search" @@ -59,15 +73,13 @@ android:id="@+id/dialtacts_options_menu_button" android:layout_width="@dimen/search_box_icon_size" android:layout_height="match_parent" - android:paddingEnd="@dimen/search_box_right_padding" + android:layout_alignParentEnd="true" android:background="?android:attr/selectableItemBackgroundBorderless" android:contentDescription="@string/action_menu_overflow_description" android:scaleType="center" android:src="@drawable/quantum_ic_more_vert_white_24" android:tint="@color/searchbox_icon_tint"/> - - </LinearLayout> + </RelativeLayout> <include layout="@layout/search_bar_expanded"/> - </view> diff --git a/java/com/android/dialer/app/res/values/dimens.xml b/java/com/android/dialer/app/res/values/dimens.xml index 5f252ee89..fdbcac93a 100644 --- a/java/com/android/dialer/app/res/values/dimens.xml +++ b/java/com/android/dialer/app/res/values/dimens.xml @@ -61,11 +61,9 @@ <dimen name="search_top_margin">8dp</dimen> <!-- Margin below the search box. --> <dimen name="search_bottom_margin">8dp</dimen> - <dimen name="search_collapsed_text_size">14sp</dimen> + <dimen name="search_collapsed_text_size">16sp</dimen> <!-- Search box interior padding - left --> - <dimen name="search_box_left_padding">8dp</dimen> - <!-- Search box interior padding - right --> - <dimen name="search_box_right_padding">8dp</dimen> + <dimen name="search_box_left_padding">4dp</dimen> <dimen name="search_box_search_icon_padding">2dp</dimen> <dimen name="search_box_collapsed_text_margin_left">22dp</dimen> <dimen name="search_list_padding_top">16dp</dimen> |