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

Commit 34b901ca authored by Daisuke Miyakawa's avatar Daisuke Miyakawa
Browse files

Filter and header refactoring. 

- have AccountFilterUtil to unify account filter implementations.
- modify account header on top of search screens
  Now it is bigger than before (40dip > 32dip), and uses people's
  blue text color instead of gray (issue 5451033)
- introduce ContactListSeparatorTextViewStyle and use it everywhere

Bug: 5269692
Bug: 5451033
Bug: 5429203
Change-Id: Ibe810ff9adaafc74d53b0dcf171a3853f4be039a
parent 699504ad

res/layout-sw580dp/list_separator.xml

+2 −8
Original line number Diff line number Diff line
@@ -17,12 +17,6 @@ 
<TextView

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

    android:id="@+id/title"

    style="?android:attr/listSeparatorTextViewStyle"

    android:layout_height="32dip"

    style="@style/ContactListSeparatorTextViewStyle"

    android:paddingLeft="8dip"

    android:paddingRight="8dip"

    android:background="@drawable/list_section_divider_holo_custom"

    android:textColor="@color/people_app_theme_color"

    android:textAllCaps="true"

    android:singleLine="true"

    android:ellipsize="end" />
 
 No newline at end of file
 
    android:paddingRight="8dip" />

res/layout/account_filter_header.xml

+2 −14
Original line number Diff line number Diff line
@@ -22,7 +22,6 @@ 
    android:id="@+id/account_filter_header_container"

    android:layout_width="match_parent"

    android:layout_height="wrap_content"

    android:minHeight="?attr/list_item_header_height"

    android:orientation="vertical"

    android:paddingTop="@dimen/contact_browser_list_top_margin"

    android:layout_marginLeft="@dimen/contact_browser_list_header_left_margin"
@@ -31,17 +30,6 @@ 
    android:visibility="gone">

    <TextView

        android:id="@+id/account_filter_header"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:singleLine="true"

        android:ellipsize="end"

        android:textStyle="bold"

        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" />

        style="@style/ContactListSeparatorTextViewStyle"

        android:paddingLeft="@dimen/contact_browser_list_item_text_indent" />

</LinearLayout>

res/layout/call_log_list_item.xml

+2 −11
Original line number Diff line number Diff line
@@ -129,20 +129,11 @@ 


    <TextView

        android:id="@+id/call_log_header"

        style="?android:attr/listSeparatorTextViewStyle"

        style="@style/ContactListSeparatorTextViewStyle"

        android:layout_marginLeft="@dimen/call_log_outer_margin"

        android:layout_marginRight="@dimen/call_log_outer_margin"

        android:paddingTop="@dimen/call_log_inner_margin"

        android:paddingBottom="@dimen/call_log_inner_margin"

        android:background="@drawable/list_section_divider_holo_custom"

        android:textAppearance="?android:attr/textAppearanceSmall"

        android:textStyle="bold"

        android:textColor="?attr/call_log_header_color"

        android:textAllCaps="true"

        android:singleLine="true"

        android:ellipsize="end"

        android:focusable="true"

    />

        android:paddingBottom="@dimen/call_log_inner_margin" />



    <View

        android:id="@+id/call_log_divider"

res/layout/directory_header.xml

+5 −7
Original line number Diff line number Diff line
@@ -20,7 +20,9 @@ 
    style="@style/DirectoryHeader"

    android:layout_width="match_parent"

    android:layout_height="wrap_content"

    android:minHeight="?attr/list_item_header_height"

    android:minHeight="@dimen/list_section_divider_min_height"

    android:background="@drawable/list_section_divider_holo_custom"

    android:paddingTop="@dimen/contact_browser_list_top_margin"

    android:paddingLeft="?attr/list_item_padding_left"

    android:paddingRight="?attr/list_item_padding_right">

    <TextView
@@ -32,7 +34,7 @@ 
        android:layout_centerVertical="true"

        android:layout_marginLeft="8dip"

        android:textAppearance="?android:attr/textAppearanceSmall"

        android:textColor="?android:attr/textColorSecondary"

        android:textColor="@color/people_app_theme_color"

        android:singleLine="true"

        android:textStyle="bold"

        android:textAllCaps="true" />
@@ -55,12 +57,8 @@ 
        android:layout_marginLeft="8dip"

        android:layout_marginRight="8dip"

        android:textAppearance="?android:attr/textAppearanceSmall"

        android:textColor="?android:attr/textColorSecondary"

        android:textColor="@color/people_app_theme_color"

        android:singleLine="true"

        android:textStyle="bold"

        android:textAllCaps="true" />

    <View

        android:id="@+id/contact_filter_header_bottom_divider"

        style="@style/SectionDivider"

        android:layout_below="@id/display_name" />

</RelativeLayout>