diff options
Diffstat (limited to 'res')
| -rw-r--r-- | res/anim/slide_in.xml | 2 | ||||
| -rw-r--r-- | res/anim/slide_out.xml | 2 | ||||
| -rw-r--r-- | res/layout/search_edittext.xml | 42 | ||||
| -rw-r--r-- | res/values/animation_constants.xml | 2 | ||||
| -rw-r--r-- | res/values/dimens.xml | 13 |
5 files changed, 30 insertions, 31 deletions
diff --git a/res/anim/slide_in.xml b/res/anim/slide_in.xml index b0eed3713..4463f2f24 100644 --- a/res/anim/slide_in.xml +++ b/res/anim/slide_in.xml @@ -15,6 +15,6 @@ --> <translate xmlns:android="http://schemas.android.com/apk/res/android" android:interpolator="@interpolator/ease_in_interpolator" - android:duration="532" + android:duration="@integer/dialpad_slide_in_duration" android:fromYDelta="67%p" android:toYDelta="0" />
\ No newline at end of file diff --git a/res/anim/slide_out.xml b/res/anim/slide_out.xml index 231555e88..88687f477 100644 --- a/res/anim/slide_out.xml +++ b/res/anim/slide_out.xml @@ -15,6 +15,6 @@ --> <translate xmlns:android="http://schemas.android.com/apk/res/android" android:interpolator="@interpolator/ease_out_interpolator" - android:duration="257" + android:duration="@integer/dialpad_slide_out_duration" android:fromYDelta="0" android:toYDelta="80%p" />
\ No newline at end of file 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" diff --git a/res/values/animation_constants.xml b/res/values/animation_constants.xml index 786306092..05b8e218d 100644 --- a/res/values/animation_constants.xml +++ b/res/values/animation_constants.xml @@ -16,6 +16,8 @@ --> <resources> <integer name="fade_duration">300</integer> + <integer name="dialpad_slide_in_duration">532</integer> + <integer name="dialpad_slide_out_duration">257</integer> <!-- Swipe constants --> <integer name="swipe_escape_velocity">100</integer> diff --git a/res/values/dimens.xml b/res/values/dimens.xml index e659f5791..6efb5ac5c 100644 --- a/res/values/dimens.xml +++ b/res/values/dimens.xml @@ -16,9 +16,6 @@ --> <resources> - <!-- Search View --> - <dimen name="search_text_size">14sp</dimen> - <!-- Drag to remove view (in dp because it is used in conjunction with a statically sized icon @@ -106,8 +103,8 @@ <dimen name="search_top_margin">8dp</dimen> <!-- Margin below the search box. --> <dimen name="search_bottom_margin">8dp</dimen> - <!-- Search box text size --> - <dimen name="search_text_size">13.24sp</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 --> @@ -115,11 +112,11 @@ <!-- Padding around the icon in the search box. --> <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">27dp</dimen> + <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> - <!-- Elevation of the search box --> + <dimen name="search_list_padding_top">8dp</dimen> <dimen name="search_box_elevation">3dp</dimen> <!-- Size of text in tabs. --> |