Account filter and profile header style fixes
Bugs: 5144226, 5142982
Fixed layout and style according to Marco's document:
1. Fixed style of account filter
2. Fixed style for profile header
3. Fixed contacts count to not include the profile
Change-Id: I0c6fc0f4839a993c0fede8840b7636c0460eed55
diff --git a/res/layout/contacts_list_content.xml b/res/layout/contacts_list_content.xml
index 567e63d..f98d751 100644
--- a/res/layout/contacts_list_content.xml
+++ b/res/layout/contacts_list_content.xml
@@ -41,14 +41,17 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:minHeight="@dimen/contact_filter_header_min_height"
- android:layout_marginLeft="8dip"
android:singleLine="true"
android:ellipsize="end"
- android:gravity="left"
+ android:textStyle="bold"
+ android:gravity="left|center_vertical"
+ android:textAllCaps="true"
+ android:paddingLeft="@dimen/contact_browser_list_item_text_indent"
android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="?android:attr/textColorSecondary" />
<View
android:id="@+id/account_filter_header_bottom_divider"
+ android:layout_height="1dip"
style="@style/SectionDivider" />
</LinearLayout>
diff --git a/res/layout/user_profile_button.xml b/res/layout/user_profile_button.xml
index b7b5e1d..4937d7b 100644
--- a/res/layout/user_profile_button.xml
+++ b/res/layout/user_profile_button.xml
@@ -19,9 +19,10 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="?android:attr/selectableItemBackground"
- android:paddingLeft="@dimen/contact_browser_list_left_margin"
android:singleLine="true"
android:text="@string/profile_display_name"
android:ellipsize="end"
+ android:minHeight="@dimen/contact_browser_list_item_photo_size"
android:gravity="left|center_vertical"
+ android:paddingLeft="@dimen/contact_browser_list_item_text_indent"
android:textAppearance="?android:attr/textAppearanceMedium" />
diff --git a/res/layout/user_profile_header.xml b/res/layout/user_profile_header.xml
index ae803ba..7c82ea4 100644
--- a/res/layout/user_profile_header.xml
+++ b/res/layout/user_profile_header.xml
@@ -16,7 +16,7 @@
<LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
- android:background="@color/contact_browser_list_bk_color"
+ android:paddingTop="@dimen/contact_browser_list_top_margin"
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="wrap_content" >
@@ -30,14 +30,14 @@
android:id="@+id/profile_title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_marginLeft="@dimen/contact_browser_list_left_margin"
android:singleLine="true"
android:text="@string/user_profile_contacts_list_header"
android:textStyle="bold"
android:ellipsize="end"
- android:gravity="left"
+ android:gravity="left|center_vertical"
android:layout_weight="1"
- android:textAppearance="?android:attr/textAppearanceMedium"
+ android:textAppearance="?android:attr/textAppearanceSmall"
+ android:paddingLeft="@dimen/contact_browser_list_item_text_indent"
android:textColor="@color/people_app_theme_color" />
<TextView
@@ -46,15 +46,15 @@
android:layout_height="wrap_content"
android:singleLine="true"
android:ellipsize="end"
- android:layout_gravity="right"
- android:textAppearance="?android:attr/textAppearanceMedium"
+ android:layout_gravity="right|center_vertical"
+ android:textAppearance="?android:attr/textAppearanceSmall"
+ android:textSize="12dip"
android:textColor="@color/contact_count_text_color" />
</LinearLayout>
<View
android:background="@color/people_app_theme_color"
- android:layout_marginLeft="@dimen/contact_browser_list_left_margin"
android:layout_width="match_parent"
- android:layout_height="1px" />
+ android:layout_height="1dip" />
</LinearLayout>
\ No newline at end of file
diff --git a/res/values/attrs.xml b/res/values/attrs.xml
index 4d4050e..0f7b62d 100644
--- a/res/values/attrs.xml
+++ b/res/values/attrs.xml
@@ -96,6 +96,8 @@
<attr name="list_item_header_underline_height" format="dimension" />
<attr name="list_item_header_underline_color" format="color" />
<attr name="list_item_contacts_count_text_color" format="color" />
+ <attr name="list_item_text_indent" format="dimension" />
+ <attr name="list_item_contacts_count_text_size" format="dimension" />
</declare-styleable>
<declare-styleable name="CallLog">
diff --git a/res/values/colors.xml b/res/values/colors.xml
index 6e6cadb..a277124 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -88,7 +88,7 @@
<!-- Colors in the contact browser list -->
<color name="contact_browser_list_bk_color">#EEEEEE</color>
- <color name="contact_count_text_color">#777777</color>
+ <color name="contact_count_text_color">#AAAAAA</color>
<!-- Color of the text of the tab carousel in the contact details -->
<color name="detail_tab_carousel_tab_label_color">#EEEEEE</color>
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index 1edc590..793365c 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -211,8 +211,10 @@
<dimen name="contact_browser_list_header_right_margin">@dimen/list_visible_scrollbar_padding</dimen>
<dimen name="contact_browser_list_left_margin">16dip</dimen>
<dimen name="contact_browser_list_right_margin">0dip</dimen>
+ <dimen name="contact_browser_list_item_photo_size">64dip</dimen>
+ <dimen name="contact_browser_list_item_text_indent">8dip</dimen>
- <dimen name="contact_browser_list_top_margin">0dip</dimen>
+ <dimen name="contact_browser_list_top_margin">8dip</dimen>
<dimen name="contacts_count_right_margin">40dip</dimen>
<!-- ContactTile Layouts -->
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 763a600..9b60ceb 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -24,7 +24,7 @@
<item name="activated_background">@drawable/list_item_activated_background</item>
<item name="section_header_background">@drawable/list_title_holo</item>
<item name="list_section_header_height">32dip</item>
- <item name="list_item_divider">@drawable/list_item_divider</item>
+ <item name="list_item_divider">?android:attr/listDivider</item>
<item name="list_item_padding_top">0dip</item>
<item name="list_item_padding_right">0dip</item>
<item name="list_item_padding_bottom">0dip</item>
@@ -35,16 +35,17 @@
<item name="list_item_vertical_divider_margin">5dip</item>
<item name="list_item_presence_icon_margin">4dip</item>
<item name="list_item_presence_icon_size">16dip</item>
- <item name="list_item_photo_size">56dip</item>
+ <item name="list_item_photo_size">@dimen/contact_browser_list_item_photo_size</item>
<item name="list_item_profile_photo_size">70dip</item>
<item name="list_item_prefix_highlight_color">#729a27</item>
- <item name="list_item_header_text_indent">4dip</item>
+ <item name="list_item_header_text_indent">8dip</item>
<item name="list_item_header_text_color">@color/people_app_theme_color</item>
<item name="list_item_header_text_size">12sp</item>
<item name="list_item_header_height">24dip</item>
<item name="list_item_header_underline_height">1px</item>
<item name="list_item_header_underline_color">@color/people_app_theme_color</item>
<item name="contact_filter_popup_width">320dip</item>
+ <item name="list_item_text_indent">@dimen/contact_browser_list_item_text_indent</item>
<!-- CallLog -->
<item name="call_log_primary_text_color">#FFFFFF</item>
<item name="call_log_primary_background_color">#000000</item>
@@ -129,7 +130,7 @@
<item name="activated_background">@drawable/list_item_activated_background</item>
<item name="section_header_background">@drawable/list_title_holo</item>
<item name="list_section_header_height">24dip</item>
- <item name="list_item_divider">@drawable/list_item_divider</item>
+ <item name="list_item_divider">?android:attr/listDivider</item>
<item name="list_item_padding_top">0dip</item>
<item name="list_item_padding_right">0dip</item>
<item name="list_item_padding_bottom">0dip</item>
@@ -140,17 +141,20 @@
<item name="list_item_vertical_divider_margin">5dip</item>
<item name="list_item_presence_icon_margin">4dip</item>
<item name="list_item_presence_icon_size">16dip</item>
- <item name="list_item_photo_size">56dip</item>
+ <item name="list_item_photo_size">@dimen/contact_browser_list_item_photo_size</item>
<item name="list_item_profile_photo_size">70dip</item>
<item name="list_item_prefix_highlight_color">#729a27</item>
- <item name="list_item_header_text_indent">4dip</item>
+ <item name="list_item_header_text_indent">@dimen/contact_browser_list_item_text_indent</item>
<item name="list_item_header_text_color">@color/people_app_theme_color</item>
- <item name="list_item_header_text_size">12sp</item>
+ <item name="list_item_header_text_size">14dip</item>
<item name="list_item_header_height">26dip</item>
- <item name="list_item_header_underline_height">1px</item>
+ <item name="list_item_header_underline_height">1dip</item>
<item name="list_item_header_underline_color">@color/people_app_theme_color</item>
<item name="list_item_contacts_count_text_color">@color/contact_count_text_color</item>
<item name="contact_filter_popup_width">320dip</item>
+ <item name="list_item_text_indent">@dimen/contact_browser_list_item_text_indent</item>
+ <item name="list_item_contacts_count_text_size">12dip</item>
+ list_item_contacts_count_text_size
<!-- Favorites -->
<item name="favorites_padding_bottom">0dip</item>
</style>
@@ -173,7 +177,7 @@
<item name="activated_background">@drawable/list_item_activated_background</item>
<item name="section_header_background">@drawable/list_title_holo</item>
<item name="list_section_header_height">32dip</item>
- <item name="list_item_divider">@drawable/list_item_divider</item>
+ <item name="list_item_divider">?android:attr/listDivider</item>
<item name="list_item_padding_top">4dip</item>
<item name="list_item_padding_right">11dip</item>
<item name="list_item_padding_bottom">4dip</item>
@@ -183,7 +187,7 @@
<item name="list_item_call_button_padding">14dip</item>
<item name="list_item_vertical_divider_margin">5dip</item>
<item name="list_item_presence_icon_margin">5dip</item>
- <item name="list_item_photo_size">56dip</item>
+ <item name="list_item_photo_size">@dimen/contact_browser_list_item_photo_size</item>
<item name="list_item_profile_photo_size">70dip</item>
<item name="list_item_prefix_highlight_color">#729a27</item>
<item name="list_item_header_text_indent">56dip</item>
@@ -194,7 +198,7 @@
<style name="ContactPickerTheme" parent="@android:Theme.Holo.Light">
<item name="section_header_background">@drawable/section_header</item>
- <item name="list_item_divider">@drawable/list_item_divider</item>
+ <item name="list_item_divider">?android:attr/listDivider</item>
<item name="list_item_padding_top">4dip</item>
<item name="list_item_padding_right">11dip</item>
<item name="list_item_padding_bottom">4dip</item>
@@ -204,7 +208,7 @@
<item name="list_item_call_button_padding">14dip</item>
<item name="list_item_vertical_divider_margin">5dip</item>
<item name="list_item_presence_icon_margin">5dip</item>
- <item name="list_item_photo_size">56dip</item>
+ <item name="list_item_photo_size">@dimen/contact_browser_list_item_photo_size</item>
<item name="list_item_profile_photo_size">70dip</item>
<item name="list_item_prefix_highlight_color">#729a27</item>
<item name="list_item_header_text_indent">56dip</item>