Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 58ab1f97 authored by Yorke Lee's avatar Yorke Lee Committed by Android Git Automerger
Browse files

am 8e616a98: am 787bbbac: Adjust fonts and list header styles for People 

* commit '8e616a98':
  Adjust fonts and list header styles for People
parents fb747e66 8e616a98

res/layout/group_account_header_horizontal.xml

+1 −1
Original line number Original line Diff line number Diff line
@@ -18,7 +18,6 @@ 
    xmlns:android="http://schemas.android.com/apk/res/android"

    xmlns:android="http://schemas.android.com/apk/res/android"

    android:layout_width="match_parent"

    android:layout_width="match_parent"

    android:layout_height="wrap_content"

    android:layout_height="wrap_content"

    android:minHeight="?attr/list_item_header_height"

    android:layout_marginLeft="?attr/list_item_padding_left"

    android:layout_marginLeft="?attr/list_item_padding_left"

    android:layout_marginRight="?attr/list_item_padding_right"

    android:layout_marginRight="?attr/list_item_padding_right"

    android:layout_marginStart="?attr/list_item_padding_left"

    android:layout_marginStart="?attr/list_item_padding_left"
@@ -46,6 +45,7 @@ 
        android:layout_height="wrap_content"

        android:layout_height="wrap_content"

        android:layout_gravity="center_vertical"

        android:layout_gravity="center_vertical"

        android:textAppearance="@style/SectionHeaderStyle"

        android:textAppearance="@style/SectionHeaderStyle"

        android:textAllCaps="false"

        android:textSize="12sp"

        android:textSize="12sp"

        android:singleLine="true"

        android:singleLine="true"

        android:ellipsize="middle"

        android:ellipsize="middle"

res/layout/group_account_header_vertical.xml

+1 −1
Original line number Original line Diff line number Diff line
@@ -18,7 +18,6 @@ 
    xmlns:android="http://schemas.android.com/apk/res/android"

    xmlns:android="http://schemas.android.com/apk/res/android"

    android:layout_width="match_parent"

    android:layout_width="match_parent"

    android:layout_height="wrap_content"

    android:layout_height="wrap_content"

    android:minHeight="?attr/list_item_header_height"

    android:layout_marginLeft="?attr/list_item_padding_left"

    android:layout_marginLeft="?attr/list_item_padding_left"

    android:layout_marginRight="?attr/list_item_padding_right"

    android:layout_marginRight="?attr/list_item_padding_right"

    android:layout_marginStart="?attr/list_item_padding_left"

    android:layout_marginStart="?attr/list_item_padding_left"
@@ -46,6 +45,7 @@ 
        android:paddingLeft="?attr/list_item_header_text_indent"

        android:paddingLeft="?attr/list_item_header_text_indent"

        android:paddingStart="?attr/list_item_header_text_indent"

        android:paddingStart="?attr/list_item_header_text_indent"

        android:textAppearance="@style/SectionHeaderStyle"

        android:textAppearance="@style/SectionHeaderStyle"

        android:textAllCaps="false"

        android:textSize="12sp"

        android:textSize="12sp"

        android:singleLine="true"

        android:singleLine="true"

        android:ellipsize="middle" />

        android:ellipsize="middle" />

res/layout/user_profile_header.xml

+3 −1
Original line number Original line Diff line number Diff line
@@ -24,6 +24,8 @@ 
    android:paddingRight="?attr/list_item_padding_right"

    android:paddingRight="?attr/list_item_padding_right"

    android:paddingStart="?attr/list_item_padding_left"

    android:paddingStart="?attr/list_item_padding_left"

    android:paddingEnd="?attr/list_item_padding_right"

    android:paddingEnd="?attr/list_item_padding_right"

    android:paddingTop="4dp"

    android:paddingBottom="8dp"

    android:background="@drawable/list_section_divider_holo_custom"

    android:background="@drawable/list_section_divider_holo_custom"

    android:gravity="center_vertical"

    android:gravity="center_vertical"

    >

    >
@@ -36,7 +38,7 @@ 
        android:text="@string/user_profile_contacts_list_header"

        android:text="@string/user_profile_contacts_list_header"

        android:ellipsize="end"

        android:ellipsize="end"

        android:layout_weight="1"

        android:layout_weight="1"

        android:textAppearance="@style/SectionHeaderStyle"

        android:textAppearance="@style/DirectoryHeaderStyle"

        android:paddingLeft="?attr/list_item_text_indent"

        android:paddingLeft="?attr/list_item_text_indent"

        android:paddingStart="?attr/list_item_text_indent" />

        android:paddingStart="?attr/list_item_text_indent" />

res/values-sw600dp/styles.xml

+5 −5
Original line number Original line Diff line number Diff line
@@ -41,10 +41,10 @@ 
        <item name="list_item_profile_photo_size">80dip</item>

        <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_prefix_highlight_color">@color/people_app_theme_color</item>

        <item name="list_item_header_text_indent">8dip</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_text_color">@color/people_app_theme_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_height">1dip</item>

        <item name="list_item_header_underline_color">@color/secondary_header_separator_color</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_data_width_weight">5</item>

        <item name="list_item_label_width_weight">3</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_photo_size">64dip</item>

        <item name="list_item_profile_photo_size">80dip</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_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_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_height">2dip</item>

        <item name="list_item_header_underline_color">@color/secondary_header_separator_color</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_data_width_weight">5</item>

res/values-sw720dp/styles.xml

+3 −3
Original line number Original line Diff line number Diff line
@@ -42,10 +42,10 @@ 
        <item name="list_item_prefix_highlight_color">@color/people_app_theme_color</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_indent">8dip</item>

        <item name="list_item_header_text_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_height">48dip</item>

        <item name="list_item_header_height">30dip</item>

        <item name="list_item_header_text_size">25sp</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_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_color">@color/people_app_theme_color</item>

        <item name="list_item_contacts_count_text_size">12sp</item>

        <item name="list_item_contacts_count_text_size">12sp</item>

        <item name="contact_browser_list_padding_left">0dip</item>

        <item name="contact_browser_list_padding_left">0dip</item>