diff options
author | Andrew Lee <anwlee@google.com> | 2014-06-03 14:03:09 -0700 |
---|---|---|
committer | Andrew Lee <anwlee@google.com> | 2014-06-03 14:41:52 -0700 |
commit | 05b6267428450f190d04af187a206cc495da8995 (patch) | |
tree | a2992806445d72fe3959d6f2af45e1965eb855d4 /res/layout | |
parent | 763d0c2afd034b4c2939199da7eba491548acdff (diff) |
DO NOT MERGE. Styling search to match redlines.
- This conflicts with some of Sai's changes, so will manually
cherrypick this CL back to master..
- 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
Change-Id: I7c3a96dd295c58c6955e6bd3e9d8cda151de4c3f
Diffstat (limited to 'res/layout')
-rw-r--r-- | res/layout/search_edittext.xml | 42 |
1 files changed, 21 insertions, 21 deletions
diff --git a/res/layout/search_edittext.xml b/res/layout/search_edittext.xml index 50cbf5af9..ac1114e2a 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,21 +39,11 @@ 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" @@ -88,7 +88,7 @@ android:id="@+id/search_back_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:layout_marginLeft="8dp" android:src="@drawable/ic_back_arrow" android:background="?android:attr/selectableItemBackground" android:contentDescription="@string/action_menu_overflow_description" @@ -97,10 +97,10 @@ <EditText android:id="@+id/search_view" android:layout_width="0dp" - android:layout_height="@dimen/search_box_icon_size" + android:layout_height="@dimen/action_bar_height" android:layout_weight="1" - android:layout_marginLeft="@dimen/search_box_text_left_margin" - android:textSize="@dimen/search_text_size" + android:layout_marginLeft="@dimen/search_box_expanded_text_margin_left" + android:textSize="@dimen/search_expanded_text_size" android:fontFamily="@string/search_font_family" android:textColor="@color/searchbox_text_color" android:inputType="textFilter" /> @@ -109,7 +109,7 @@ android:id="@+id/search_close_button" 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:layout_marginRight="8dp" android:src="@drawable/ic_close_dk" android:clickable="true" android:background="?android:attr/selectableItemBackground" |