diff options
author | Andrew Lee <anwlee@google.com> | 2014-06-03 14:03:09 -0700 |
---|---|---|
committer | Andrew Lee <anwlee@google.com> | 2014-06-03 16:14:39 -0700 |
commit | 9da8fb46fa21159321295119e1b2075747cfbbf9 (patch) | |
tree | 4c793433ff90aa2f15fb610dfc0f696987a29e1e /res | |
parent | 82d6da53d993bb3a5cabf7c9f5f0c0e62488c15f (diff) |
DO NOT MERGE. Styling search to match redlines.
- Cherrypicking changes back to master. Mostly, this involved
transferring changes dealing with padding and the translation values.
- Shift arrow/close icons.
- Use 20sp font in expanded search (causes baseline to shift down).
- Update action bar movement to use dialpad's interpolators and
durations.
- Smoothed out animations. Icons in the view being faded out are now
instantaneously set to GONE. The margin animator when going from
collapsed to expanded starts at 0.8f now, so that the searchbox does
not shrink momentarily when switched to the 9-patch, because of the
shadow.
- Fix clipping because of 9-patch; refactored logic for updating
the position and padding from the Activity into SearchFragment. This
was motivated in part because we want a padding at the top of this
list for the first item, but when the dialpad is shown we do not
want that padding.
Bug: 15343931
Conflicts:
res/layout/search_edittext.xml
res/values/dimens.xml
src/com/android/dialer/DialtactsActivity.java
src/com/android/dialer/list/SearchFragment.java
Change-Id: I8519e7e2ef5c75c0f170ff61ed22f44f95e07f74
Diffstat (limited to 'res')
-rw-r--r-- | res/layout/search_edittext.xml | 33 | ||||
-rw-r--r-- | res/values/dimens.xml | 8 |
2 files changed, 23 insertions, 18 deletions
diff --git a/res/layout/search_edittext.xml b/res/layout/search_edittext.xml index ce8568681..9b8031efe 100644 --- a/res/layout/search_edittext.xml +++ b/res/layout/search_edittext.xml @@ -9,18 +9,28 @@ android:layout_marginBottom="@dimen/search_bottom_margin" android:layout_marginLeft="@dimen/search_margin_horizontal" android:layout_marginRight="@dimen/search_margin_horizontal" - android:paddingLeft="@dimen/search_box_left_padding" - android:paddingRight="@dimen/search_box_right_padding" android:background="@drawable/rounded_corner" - android:elevation="@dimen/search_box_elevation" - > + android:elevation="@dimen/search_box_elevation"> + <LinearLayout android:id="@+id/search_box_collapsed" android:layout_width="match_parent" android:layout_height="match_parent" + android:paddingStart="@dimen/search_box_left_padding" + android:paddingEnd="@dimen/search_box_right_padding" android:gravity="center_vertical" android:orientation="horizontal" > + <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" + android:importantForAccessibility="no" + android:tint="@color/searchbox_icon_tint" /> + <!-- Portion of the search box that starts a search when clicked --> <LinearLayout android:id="@+id/search_box_start_search" @@ -29,23 +39,12 @@ android:layout_weight="1" 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" - android:importantForAccessibility="no" - android:tint="@color/searchbox_icon_tint" /> - <TextView android:layout_width="wrap_content" android:layout_height="@dimen/search_box_icon_size" - android:layout_marginLeft="@dimen/search_box_text_left_margin" - android:textSize="@dimen/search_text_size" + android:layout_marginLeft="@dimen/search_box_collapsed_text_margin_left" + android:textSize="@dimen/search_collapsed_text_size" android:fontFamily="@string/search_font_family" - android:textColor="@color/searchbox_text_color" android:textColorHint="@color/searchbox_hint_text_color" android:gravity="center_vertical" android:hint="@string/dialer_hint_find_contact" /> diff --git a/res/values/dimens.xml b/res/values/dimens.xml index 0aa3cc5a2..416c3138d 100644 --- a/res/values/dimens.xml +++ b/res/values/dimens.xml @@ -98,12 +98,18 @@ <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_expanded_text_size">20sp</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_search_icon_padding">4dp</dimen> - <!-- Elevation of the search box --> + <dimen name="search_box_collapsed_text_margin_left">24dp</dimen> + <dimen name="search_box_expanded_text_margin_left">26dp</dimen> + <!-- Size of the icon (voice search, close search) in the search box. --> + <dimen name="search_box_icon_size">28dp</dimen> + <dimen name="search_list_padding_top">8dp</dimen> <dimen name="search_box_elevation">3dp</dimen> <!-- Size of text in tabs. --> |