Merge "Import translations. DO NOT MERGE" into lmp-dev
diff --git a/res-common/layout/account_filter_header.xml b/res-common/layout/account_filter_header.xml
index 268a17e..2b6e110 100644
--- a/res-common/layout/account_filter_header.xml
+++ b/res-common/layout/account_filter_header.xml
@@ -17,22 +17,28 @@
<!-- Layout showing the type of account filter
(e.g. All contacts filter, custom filter, etc.),
which is the header of all contact lists. -->
-<LinearLayout
+
+<!-- Solely used to set a background color -->
+<FrameLayout
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:orientation="vertical"
- android:paddingTop="@dimen/list_header_extra_top_padding"
- android:layout_marginLeft="@dimen/contact_browser_list_header_left_margin"
- android:layout_marginRight="@dimen/contact_browser_list_header_right_margin"
- android:layout_marginStart="@dimen/contact_browser_list_header_left_margin"
- android:layout_marginEnd="@dimen/contact_browser_list_header_right_margin"
- android:background="?android:attr/selectableItemBackground"
- android:visibility="gone">
- <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" />
-</LinearLayout>
+ 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"
+ android:layout_marginStart="@dimen/contact_browser_list_header_left_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>
diff --git a/res-common/layout/contact_list_content.xml b/res-common/layout/contact_list_content.xml
index 1e5934c..c29bb3d 100644
--- a/res-common/layout/contact_list_content.xml
+++ b/res-common/layout/contact_list_content.xml
@@ -29,9 +29,7 @@
<!-- Shown only when an Account filter is set.
- paddingTop should be here to show "shade" effect correctly. -->
- <include
- android:id="@+id/account_filter_header_container"
- layout="@layout/account_filter_header" />
+ <include layout="@layout/account_filter_header" />
<FrameLayout
android:layout_width="match_parent"
@@ -47,6 +45,8 @@
android:layout_marginRight="?attr/contact_browser_list_padding_right"
android:layout_marginStart="?attr/contact_browser_list_padding_left"
android:layout_marginEnd="?attr/contact_browser_list_padding_right"
+ android:paddingTop="?attr/list_item_padding_top"
+ android:clipToPadding="false"
android:fastScrollEnabled="true"
android:fadingEdge="none" />
<ProgressBar
diff --git a/res-common/values/colors.xml b/res-common/values/colors.xml
index d9dcf15..aafff75 100644
--- a/res-common/values/colors.xml
+++ b/res-common/values/colors.xml
@@ -148,6 +148,6 @@
<color name="search_shortcut_icon_color">#f8f8f8</color>
<!-- Color of the background of the contact detail and editor pages -->
- <color name="background_primary">#f5f5f5</color>
+ <color name="background_primary">#e3e3e3</color>
<color name="contact_all_list_background_color">#FFFFFF</color>
</resources>
diff --git a/res-common/values/dimens.xml b/res-common/values/dimens.xml
index 3d48fa2..57bcdfd 100644
--- a/res-common/values/dimens.xml
+++ b/res-common/values/dimens.xml
@@ -30,8 +30,8 @@
<!-- Horizontal padding in between contact tiles -->
<dimen name="contact_tile_divider_padding">23dip</dimen>
- <!-- Horizontal padding before the first tile and after the last tile -->
- <dimen name="contact_tile_start_end_padding">16dip</dimen>
+ <!-- Horizontal whitespace (both padding and margin) before the first tile and after the last tile -->
+ <dimen name="contact_tile_start_end_whitespace">16dip</dimen>
<!-- Left and right padding for a contact detail item -->
<dimen name="detail_item_side_margin">16dip</dimen>