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

Commit 8feafa54 authored by Daisuke Miyakawa's avatar Daisuke Miyakawa Committed by Android (Google) Code Review
Browse files

Merge "Use custom filter when filter isn't saved"

parents dfce573f d4ed72eb

res/values-sw580dp-w720dp/styles.xml

+0 −1
Original line number Diff line number Diff line
@@ -43,7 +43,6 @@ 
        <item name="list_item_header_underline_height">1dip</item>

        <item name="list_item_contacts_count_text_color">@color/contact_count_text_color</item>

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

        <item name="contact_filter_popup_width">320dip</item>

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

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

        <item name="contact_browser_background">@android:color/transparent</item>

res/values-sw580dp/styles.xml

+1 −3
Original line number Diff line number Diff line
@@ -43,7 +43,6 @@ 
        <item name="list_item_header_underline_height">1dip</item>

        <item name="list_item_contacts_count_text_color">@color/contact_count_text_color</item>

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

        <item name="contact_filter_popup_width">320dip</item>

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

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

        <item name="contact_browser_background">@android:color/transparent</item>
@@ -75,7 +74,6 @@ 
        <item name="list_item_header_underline_height">1dip</item>

        <item name="list_item_contacts_count_text_color">@color/contact_count_text_color</item>

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

        <item name="contact_filter_popup_width">320dip</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>
@@ -94,7 +92,7 @@ 
    </style>



    <style name="CustomContactListFilterView" parent="ContactListFilterTheme">

        <item name="android:layout_width">400dip</item>

        <item name="android:layout_width">match_parent</item>

        <item name="android:layout_height">400dip</item>

    </style>

res/values/attrs.xml

+0 −1
Original line number Diff line number Diff line
@@ -67,7 +67,6 @@ 
    </declare-styleable>



    <declare-styleable name="ContactBrowser">

        <attr name="contact_filter_popup_width" format="dimension"/>

        <attr name="contact_browser_list_padding_left" format="dimension"/>

        <attr name="contact_browser_list_padding_right" format="dimension"/>

        <attr name="contact_browser_background" format="reference"/>

res/values/styles.xml

+0 −3
Original line number Diff line number Diff line
@@ -44,7 +44,6 @@ 
        <item name="list_item_header_height">24dip</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="contact_filter_popup_width">320dip</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/black</item>
@@ -154,7 +153,6 @@ 
        <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="list_item_header_text_indent">8dip</item>

        <item name="contact_filter_popup_width">320dip</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>
@@ -198,7 +196,6 @@ 
        <item name="list_item_header_text_color">?color/section_header_text_color</item>

        <item name="list_item_header_text_size">14sp</item>

        <item name="list_item_header_text_indent">8dip</item>

        <item name="contact_filter_popup_width">320dip</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>

src/com/android/contacts/list/ContactBrowseListFragment.java

+1 −5
Original line number Diff line number Diff line
@@ -660,11 +660,7 @@ public abstract class ContactBrowseListFragment extends 
    }



    private void restoreFilter() {

        mFilter = ContactListFilter.restoreFromPreferences(mPrefs);

        if (mFilter == null) {

            mFilter = ContactListFilter.createFilterWithType(

                    ContactListFilter.FILTER_TYPE_ALL_ACCOUNTS);

        }

        mFilter = ContactListFilter.restoreDefaultPreferences(mPrefs);

    }



    private String getPersistentSelectionKey() {