Merge "Update margins around directory headers and search bar icons." into lmp-dev
diff --git a/res-common/layout/directory_header.xml b/res-common/layout/directory_header.xml
index b62b6b6..b85ceff 100644
--- a/res-common/layout/directory_header.xml
+++ b/res-common/layout/directory_header.xml
@@ -25,8 +25,8 @@
android:paddingStart="?attr/list_item_padding_left"
android:paddingEnd="?attr/list_item_padding_right"
android:paddingTop="@dimen/directory_header_extra_top_padding"
+ android:paddingBottom="@dimen/directory_header_extra_bottom_padding"
android:minHeight="@dimen/list_section_divider_min_height"
- android:layout_marginTop="@dimen/list_header_extra_top_padding"
android:layout_width="match_parent"
android:layout_height="wrap_content" >
<TextView
diff --git a/res-common/layout/search_bar_expanded.xml b/res-common/layout/search_bar_expanded.xml
index caa4715..3c71b50 100644
--- a/res-common/layout/search_bar_expanded.xml
+++ b/res-common/layout/search_bar_expanded.xml
@@ -26,7 +26,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_margin="@dimen/search_box_navigation_icon_margin"
android:src="@drawable/ic_back_arrow"
android:background="?android:attr/selectableItemBackgroundBorderless"
android:contentDescription="@string/action_menu_back_from_search"
@@ -50,9 +50,9 @@
<ImageView
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_height="@dimen/search_box_close_icon_size"
+ android:layout_width="@dimen/search_box_close_icon_size"
+ android:layout_margin="@dimen/search_box_close_icon_margin"
android:src="@drawable/ic_close_dk"
android:clickable="true"
android:background="?android:attr/selectableItemBackgroundBorderless"
diff --git a/res-common/values/dimens.xml b/res-common/values/dimens.xml
index 624c9ad..cf6ba84 100644
--- a/res-common/values/dimens.xml
+++ b/res-common/values/dimens.xml
@@ -25,7 +25,8 @@
This value is for making the hidden configuration explicit in xml. -->
<dimen name="list_section_divider_min_height">32dip</dimen>
- <dimen name="directory_header_extra_top_padding">12dp</dimen>
+ <dimen name="directory_header_extra_top_padding">18dp</dimen>
+ <dimen name="directory_header_extra_bottom_padding">8dp</dimen>
<!-- Horizontal padding in between contact tiles -->
<dimen name="contact_tile_divider_padding">23dip</dimen>
@@ -81,6 +82,7 @@
<!-- contact browser list margins -->
<dimen name="contact_browser_list_item_text_size">16sp</dimen>
<dimen name="contact_browser_list_item_photo_size">40dp</dimen>
+ <dimen name="contact_browser_list_item_gap_between_image_and_text">15dp</dimen>
<dimen name="contact_browser_list_top_margin">12dp</dimen>
<!-- Dimensions for "No contacts" string in PhoneFavoriteFragment for the All contacts
@@ -121,10 +123,17 @@
<!-- Padding around the icon in the search box. -->
<dimen name="search_box_icon_margin">4dp</dimen>
- <!-- Size of the icon (voice search, close search) in the search box. -->
- <dimen name="search_box_icon_size">32dp</dimen>
+ <!-- Size of the icon (voice search, back arrow) in the search box. -->
+ <dimen name="search_box_icon_size">28dp</dimen>
+ <!-- Size of the close icon.
+ Because it expands diagonally, it needs to be shrunk to look relatively the same size -->
+ <dimen name="search_box_close_icon_size">24dp</dimen>
+ <!-- Padding around back arrow icon in the search box -->
+ <dimen name="search_box_navigation_icon_margin">14dp</dimen>
+ <!-- Padding around close icon in the search box -->
+ <dimen name="search_box_close_icon_margin">16dp</dimen>
<!-- Left margin of the text field in the search box. -->
- <dimen name="search_box_text_left_margin">27dp</dimen>
+ <dimen name="search_box_text_left_margin">15dp</dimen>
<!-- Search box text size -->
<dimen name="search_text_size">20sp</dimen>