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

Commit e2c99d07 authored by Itzhak Katzenelson's avatar Itzhak Katzenelson Committed by Android (Google) Code Review
Browse files

Merge "Account filter and profile header style fixes"

parents 06c3ca10 30dff0f1

res/layout/contacts_list_content.xml

+5 −2
Original line number Diff line number Diff line
@@ -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>

res/layout/user_profile_button.xml

+2 −1
Original line number Diff line number Diff line
@@ -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" />

res/layout/user_profile_header.xml

+8 −8
Original line number Diff line number Diff line
@@ -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

res/values/attrs.xml

+2 −0
Original line number Diff line number Diff line
@@ -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">

res/values/colors.xml

+1 −1
Original line number Diff line number Diff line
@@ -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>