Merge "Moving up avatar by 1dp (2/2)" into ub-contactsdialer-f-dev
diff --git a/res-common/layout/account_filter_header.xml b/res-common/layout/account_filter_header.xml
index f053fe0..d348e82 100644
--- a/res-common/layout/account_filter_header.xml
+++ b/res-common/layout/account_filter_header.xml
@@ -41,6 +41,7 @@
android:layout_marginStart="@dimen/contact_browser_list_header_text_margin"
android:layout_marginEnd="@dimen/contact_browser_list_header_right_margin"
style="@style/ContactListSeparatorTextViewStyle"
+ android:textAlignment="viewStart"
android:paddingLeft="@dimen/contact_browser_list_item_text_indent"
android:paddingStart="@dimen/contact_browser_list_item_text_indent" />
</LinearLayout>
diff --git a/res-common/layout/account_selector_list_item_condensed.xml b/res-common/layout/account_selector_list_item_condensed.xml
index 18820ce..6720065 100644
--- a/res-common/layout/account_selector_list_item_condensed.xml
+++ b/res-common/layout/account_selector_list_item_condensed.xml
@@ -21,7 +21,7 @@
<ImageView android:id="@android:id/icon"
android:layout_width="@dimen/detail_network_icon_size"
android:layout_height="@dimen/detail_network_icon_size"
- android:layout_marginStart="20dp"
+ android:layout_marginStart="24dp"
android:layout_marginEnd="16dp"
android:layout_gravity="center_vertical" />
@@ -38,7 +38,7 @@
android:layout_marginRight="8dip"
android:layout_marginEnd="8dip"
android:textSize="16sp"
- android:textColor="#000000"
+ android:textColor="@color/contacts_text_color"
android:textAppearance="?android:attr/textAppearanceMedium"
android:singleLine="true"
android:ellipsize="end"/>
diff --git a/res-common/layout/dialog_title.xml b/res-common/layout/dialog_title.xml
index d673e23..4e32941 100644
--- a/res-common/layout/dialog_title.xml
+++ b/res-common/layout/dialog_title.xml
@@ -22,7 +22,7 @@
android:paddingStart="24dp"
android:paddingEnd="24dp"
android:textSize="20sp"
- android:textColor="#000000"
+ android:textColor="@color/contacts_text_color"
android:textStyle="bold"
android:ellipsize="end"
/>
\ No newline at end of file
diff --git a/res-common/values/colors.xml b/res-common/values/colors.xml
index 7840058..f547d80 100644
--- a/res-common/values/colors.xml
+++ b/res-common/values/colors.xml
@@ -185,4 +185,7 @@
<color name="custom_filter_divider">#dbdbdb</color>
<color name="material_star_pink">#f50057</color>
+
+ <!-- Primary text color in Contacts app -->
+ <color name="contacts_text_color">#333333</color>
</resources>
diff --git a/res-common/values/dimens.xml b/res-common/values/dimens.xml
index 74557f5..a382ad2 100644
--- a/res-common/values/dimens.xml
+++ b/res-common/values/dimens.xml
@@ -58,11 +58,14 @@
<dimen name="contact_browser_list_header_icon_left_margin">16dp</dimen>
<dimen name="contact_browser_list_header_icon_right_margin">14dp</dimen>
+ <dimen name="contact_browser_list_header_icon_left_margin_alt">18dp</dimen>
+ <dimen name="contact_browser_list_header_icon_right_margin_alt">16dp</dimen>
<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_icon_size_alt">20dp</dimen>
<dimen name="contact_browser_list_header_text_margin">10dp</dimen>
<!-- Width of a contact list item section header. -->
<dimen name="contact_list_section_header_width">56dp</dimen>