diff options
author | Yorke Lee <yorkelee@google.com> | 2013-10-15 07:29:15 -0700 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2013-10-15 07:29:15 -0700 |
commit | 8e616a9883a6a6c144d292d9ecc9099186ff6a3b (patch) | |
tree | 4a87eb809ee3d1d31e6a68bcba6af5db6cbe7c17 | |
parent | 101c91cd0c663d9793de96b5fbc8cf3429f9f893 (diff) | |
parent | 787bbbac6d53ec612cc7298bdad5060a904aba9a (diff) | |
download | Contacts-8e616a9883a6a6c144d292d9ecc9099186ff6a3b.tar.gz |
am 787bbbac: Adjust fonts and list header styles for People
* commit '787bbbac6d53ec612cc7298bdad5060a904aba9a':
Adjust fonts and list header styles for People
-rw-r--r-- | res/layout/group_account_header_horizontal.xml | 2 | ||||
-rw-r--r-- | res/layout/group_account_header_vertical.xml | 2 | ||||
-rw-r--r-- | res/layout/user_profile_header.xml | 4 | ||||
-rw-r--r-- | res/values-sw600dp/styles.xml | 10 | ||||
-rw-r--r-- | res/values-sw720dp/styles.xml | 6 | ||||
-rw-r--r-- | res/values/styles.xml | 8 |
6 files changed, 17 insertions, 15 deletions
diff --git a/res/layout/group_account_header_horizontal.xml b/res/layout/group_account_header_horizontal.xml index fe0ca2d5b..918fd9fa7 100644 --- a/res/layout/group_account_header_horizontal.xml +++ b/res/layout/group_account_header_horizontal.xml @@ -18,7 +18,6 @@ xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="match_parent" android:layout_height="wrap_content" - android:minHeight="?attr/list_item_header_height" android:layout_marginLeft="?attr/list_item_padding_left" android:layout_marginRight="?attr/list_item_padding_right" android:layout_marginStart="?attr/list_item_padding_left" @@ -46,6 +45,7 @@ android:layout_height="wrap_content" android:layout_gravity="center_vertical" android:textAppearance="@style/SectionHeaderStyle" + android:textAllCaps="false" android:textSize="12sp" android:singleLine="true" android:ellipsize="middle" diff --git a/res/layout/group_account_header_vertical.xml b/res/layout/group_account_header_vertical.xml index b3e0eb10a..dc03b22e3 100644 --- a/res/layout/group_account_header_vertical.xml +++ b/res/layout/group_account_header_vertical.xml @@ -18,7 +18,6 @@ xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="match_parent" android:layout_height="wrap_content" - android:minHeight="?attr/list_item_header_height" android:layout_marginLeft="?attr/list_item_padding_left" android:layout_marginRight="?attr/list_item_padding_right" android:layout_marginStart="?attr/list_item_padding_left" @@ -46,6 +45,7 @@ android:paddingLeft="?attr/list_item_header_text_indent" android:paddingStart="?attr/list_item_header_text_indent" android:textAppearance="@style/SectionHeaderStyle" + android:textAllCaps="false" android:textSize="12sp" android:singleLine="true" android:ellipsize="middle" /> diff --git a/res/layout/user_profile_header.xml b/res/layout/user_profile_header.xml index fb5341b80..1d08298f5 100644 --- a/res/layout/user_profile_header.xml +++ b/res/layout/user_profile_header.xml @@ -24,6 +24,8 @@ android:paddingRight="?attr/list_item_padding_right" android:paddingStart="?attr/list_item_padding_left" android:paddingEnd="?attr/list_item_padding_right" + android:paddingTop="4dp" + android:paddingBottom="8dp" android:background="@drawable/list_section_divider_holo_custom" android:gravity="center_vertical" > @@ -36,7 +38,7 @@ android:text="@string/user_profile_contacts_list_header" android:ellipsize="end" android:layout_weight="1" - android:textAppearance="@style/SectionHeaderStyle" + android:textAppearance="@style/DirectoryHeaderStyle" android:paddingLeft="?attr/list_item_text_indent" android:paddingStart="?attr/list_item_text_indent" /> diff --git a/res/values-sw600dp/styles.xml b/res/values-sw600dp/styles.xml index bdbbd01f6..7ab909e08 100644 --- a/res/values-sw600dp/styles.xml +++ b/res/values-sw600dp/styles.xml @@ -41,10 +41,10 @@ <item name="list_item_profile_photo_size">80dip</item> <item name="list_item_prefix_highlight_color">@color/people_app_theme_color</item> <item name="list_item_header_text_indent">8dip</item> - <item name="list_item_header_text_size">25sp</item> + <item name="list_item_header_text_size">14sp</item> <item name="list_item_header_text_color">@color/people_app_theme_color</item> - <item name="list_item_header_height">48dip</item> - <item name="list_item_header_underline_height">2dip</item> + <item name="list_item_header_height">30dip</item> + <item name="list_item_header_underline_height">1dip</item> <item name="list_item_header_underline_color">@color/secondary_header_separator_color</item> <item name="list_item_data_width_weight">5</item> <item name="list_item_label_width_weight">3</item> @@ -74,9 +74,9 @@ <item name="list_item_photo_size">64dip</item> <item name="list_item_profile_photo_size">80dip</item> <item name="list_item_header_text_indent">8dip</item> - <item name="list_item_header_text_size">20sp</item> + <item name="list_item_header_text_size">14sp</item> <item name="list_item_header_text_color">@color/dialtacts_secondary_text_color</item> - <item name="list_item_header_height">48dip</item> + <item name="list_item_header_height">30dip</item> <item name="list_item_header_underline_height">2dip</item> <item name="list_item_header_underline_color">@color/secondary_header_separator_color</item> <item name="list_item_data_width_weight">5</item> diff --git a/res/values-sw720dp/styles.xml b/res/values-sw720dp/styles.xml index 917877567..22653738d 100644 --- a/res/values-sw720dp/styles.xml +++ b/res/values-sw720dp/styles.xml @@ -42,10 +42,10 @@ <item name="list_item_prefix_highlight_color">@color/people_app_theme_color</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_height">48dip</item> - <item name="list_item_header_text_size">25sp</item> + <item name="list_item_header_height">30dip</item> + <item name="list_item_header_text_size">14sp</item> <item name="list_item_header_underline_color">@color/secondary_header_separator_color</item> - <item name="list_item_header_underline_height">2dip</item> + <item name="list_item_header_underline_height">1dip</item> <item name="list_item_contacts_count_text_color">@color/people_app_theme_color</item> <item name="list_item_contacts_count_text_size">12sp</item> <item name="contact_browser_list_padding_left">0dip</item> diff --git a/res/values/styles.xml b/res/values/styles.xml index ad86bc539..0c7c0eafe 100644 --- a/res/values/styles.xml +++ b/res/values/styles.xml @@ -81,15 +81,15 @@ <item name="list_item_profile_photo_size">70dip</item> <item name="list_item_prefix_highlight_color">@color/people_app_theme_color</item> <item name="list_item_header_text_color">@color/people_app_theme_color</item> - <item name="list_item_header_text_size">25sp</item> - <item name="list_item_header_height">48dip</item> - <item name="list_item_header_underline_height">2dip</item> + <item name="list_item_header_text_size">14sp</item> + <item name="list_item_header_height">30dip</item> + <item name="list_item_header_underline_height">1dip</item> <item name="list_item_header_underline_color">@color/secondary_header_separator_color</item> <item name="list_item_data_width_weight">5</item> <item name="list_item_label_width_weight">3</item> <item name="list_item_contacts_count_text_color">@color/people_app_theme_color</item> <item name="list_item_header_text_indent">8dip</item> - <item name="contact_browser_list_padding_left">8dip</item> + <item name="contact_browser_list_padding_left">16dip</item> <item name="contact_browser_list_padding_right">0dip</item> <item name="contact_browser_background">@android:color/transparent</item> <item name="list_item_text_indent">@dimen/contact_browser_list_item_text_indent</item> |