Merge "Import translations. DO NOT MERGE"
diff --git a/res-common/drawable-hdpi/list_section_divider_holo_custom.9.png b/res-common/drawable-hdpi/list_section_divider_holo_custom.9.png
deleted file mode 100644
index a0f1756..0000000
--- a/res-common/drawable-hdpi/list_section_divider_holo_custom.9.png
+++ /dev/null
Binary files differ
diff --git a/res-common/drawable-ldrtl-hdpi/list_section_divider_holo_custom.9.png b/res-common/drawable-ldrtl-hdpi/list_section_divider_holo_custom.9.png
deleted file mode 100644
index 569d28f..0000000
--- a/res-common/drawable-ldrtl-hdpi/list_section_divider_holo_custom.9.png
+++ /dev/null
Binary files differ
diff --git a/res-common/drawable-ldrtl-mdpi/list_section_divider_holo_custom.9.png b/res-common/drawable-ldrtl-mdpi/list_section_divider_holo_custom.9.png
deleted file mode 100644
index 065ff62..0000000
--- a/res-common/drawable-ldrtl-mdpi/list_section_divider_holo_custom.9.png
+++ /dev/null
Binary files differ
diff --git a/res-common/drawable-ldrtl-xhdpi/list_section_divider_holo_custom.9.png b/res-common/drawable-ldrtl-xhdpi/list_section_divider_holo_custom.9.png
deleted file mode 100644
index af58554..0000000
--- a/res-common/drawable-ldrtl-xhdpi/list_section_divider_holo_custom.9.png
+++ /dev/null
Binary files differ
diff --git a/res-common/drawable-mdpi/list_section_divider_holo_custom.9.png b/res-common/drawable-mdpi/list_section_divider_holo_custom.9.png
deleted file mode 100644
index 1d9371d..0000000
--- a/res-common/drawable-mdpi/list_section_divider_holo_custom.9.png
+++ /dev/null
Binary files differ
diff --git a/res-common/drawable-xhdpi/list_section_divider_holo_custom.9.png b/res-common/drawable-xhdpi/list_section_divider_holo_custom.9.png
deleted file mode 100644
index 8fb0636..0000000
--- a/res-common/drawable-xhdpi/list_section_divider_holo_custom.9.png
+++ /dev/null
Binary files differ
diff --git a/res-common/layout/account_filter_header.xml b/res-common/layout/account_filter_header.xml
index 2b6e110..c4b729c 100644
--- a/res-common/layout/account_filter_header.xml
+++ b/res-common/layout/account_filter_header.xml
@@ -17,28 +17,29 @@
<!-- Layout showing the type of account filter
(e.g. All contacts filter, custom filter, etc.),
which is the header of all contact lists. -->
-
-<!-- Solely used to set a background color -->
-<FrameLayout
+<LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
+ android:id="@+id/account_filter_header_container"
android:layout_width="match_parent"
- android:layout_height="wrap_content"
+ android:layout_height="@dimen/contact_browser_list_header_height"
+ android:paddingTop="@dimen/list_header_extra_top_padding"
+ android:visibility="gone"
+ android:orientation="horizontal"
android:background="@color/background_primary">
- <!-- Used to show the touch feedback -->
- <FrameLayout
- android:id="@+id/account_filter_header_container"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:paddingTop="@dimen/list_header_extra_top_padding"
+
+ <ImageView
+ android:id="@+id/account_filter_icon"
+ android:layout_height="@dimen/contact_browser_list_header_icon_size"
+ android:layout_width="@dimen/contact_browser_list_header_icon_size"
android:layout_marginStart="@dimen/contact_browser_list_header_left_margin"
+ android:layout_gravity="center_vertical"/>
+
+ <TextView
+ android:id="@+id/account_filter_header"
+ android:layout_gravity="center_vertical"
+ android:layout_marginStart="@dimen/contact_browser_list_header_text_margin"
android:layout_marginEnd="@dimen/contact_browser_list_header_right_margin"
- android:background="?android:attr/selectableItemBackground"
- android:visibility="gone">
- <!-- Shows the text and underlining -->
- <TextView
- android:id="@+id/account_filter_header"
- style="@style/ContactListSeparatorTextViewStyle"
- android:paddingLeft="@dimen/contact_browser_list_item_text_indent"
- android:paddingStart="@dimen/contact_browser_list_item_text_indent" />
- </FrameLayout>
-</FrameLayout>
+ style="@style/ContactListSeparatorTextViewStyle"
+ android:paddingLeft="@dimen/contact_browser_list_item_text_indent"
+ android:paddingStart="@dimen/contact_browser_list_item_text_indent" />
+</LinearLayout>
diff --git a/res-common/values/dimens.xml b/res-common/values/dimens.xml
index e82cc25..58be1e1 100644
--- a/res-common/values/dimens.xml
+++ b/res-common/values/dimens.xml
@@ -20,9 +20,6 @@
in contacts/group lists. -->
<dimen name="list_header_extra_top_padding">0dip</dimen>
- <!-- Minimum height used with @drawable/list_section_divider_holo_custom.
- Right now the drawable has implicit 32dip minimal height, which is confusing.
- 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">18dp</dimen>
@@ -49,6 +46,9 @@
<dimen name="contact_browser_list_header_left_margin">16dip</dimen>
<dimen name="contact_browser_list_header_right_margin">@dimen/list_visible_scrollbar_padding</dimen>
<dimen name="contact_browser_list_item_text_indent">8dip</dimen>
+ <dimen name="contact_browser_list_header_height">48dp</dimen>
+ <dimen name="contact_browser_list_header_icon_size">24dp</dimen>
+ <dimen name="contact_browser_list_header_text_margin">20dp</dimen>
<!-- Width of a contact list item section header. -->
<dimen name="contact_list_section_header_width">48dp</dimen>
@@ -127,7 +127,7 @@
<!-- Padding around back arrow icon in the search box -->
<dimen name="search_box_navigation_icon_margin">14dp</dimen>
<!-- Left margin of the text field in the search box. -->
- <dimen name="search_box_text_left_margin">15dp</dimen>
+ <dimen name="search_box_text_left_margin">8dp</dimen>
<!-- Search box text size -->
<dimen name="search_text_size">16sp</dimen>
diff --git a/res-common/values/styles.xml b/res-common/values/styles.xml
index 77d0c4b..e6150df 100644
--- a/res-common/values/styles.xml
+++ b/res-common/values/styles.xml
@@ -43,7 +43,6 @@
<item name="android:layout_height">wrap_content</item>
<!-- See comments for @dimen/list_section_divider_min_height -->
<item name="android:minHeight">@dimen/list_section_divider_min_height</item>
- <item name="android:background">@drawable/list_section_divider_holo_custom</item>
<item name="android:textAppearance">@style/DirectoryHeaderStyle</item>
<item name="android:gravity">center_vertical</item>
<item name="android:paddingLeft">8dip</item>
