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

Commit 92942632 authored by Walter Jang's avatar Walter Jang
Browse files

Restore the "Contacts to display" custom filter (1/3) 

* Revert "Remove AccountFilterActivity and its usage (Contacts)"
  This reverts commit 1fc8847a.
* But we don't restore the changes to DefaultContactBrowseListFragment
  since we won't be starting the "Contacts to display" filter
  from an overflow menu option on PeopleActivity.
* In DrawerActivity and PeopleActivity, everywhere we check for
  FITLER_TYPE_ALL_ACCOUNTS, we must also accept FILTER_TYPE_CUSTOM,
  since either of those can be used for the default/main contacts
  list again.

Bug 29185471

Change-Id: Ie77e8acb16980b9015bd1f1f4af9fb7a014f3c51
parent 39f22a2c

AndroidManifest.xml

+12 −0
Original line number Diff line number Diff line
@@ -216,6 +216,18 @@ 
            android:theme="@style/ContactsPreferencesTheme"

            android:exported="false" />



        <!-- Used to filter contacts list by account -->

        <activity

            android:name=".common.list.AccountFilterActivity"

            android:label="@string/activity_title_contacts_filter"

            android:theme="@style/ContactListFilterTheme" />



        <!-- Used to select display and sync groups -->

        <activity

            android:name=".common.list.CustomContactListFilterActivity"

            android:label="@string/custom_list_filter"

            android:theme="@style/ContactListFilterTheme" />



        <activity

            android:name=".common.activity.RequestPermissionsActivity"

            android:label="@string/launcherActivityLabel"

res/drawable-hdpi/unknown_source.png

deleted100644 → 0
−4.23 KiB
Loading image diff...

res/drawable-mdpi/unknown_source.png

deleted100644 → 0
−2.01 KiB
Loading image diff...

res/drawable-xhdpi/unknown_source.png

deleted100644 → 0
−6.33 KiB
Loading image diff...

res/values/styles.xml

+4 −0
Original line number Diff line number Diff line
@@ -281,6 +281,10 @@ 
        <item name="android:listViewStyle">@style/ListViewStyle</item>

    </style>



    <style name="ContactListFilterTheme" parent="@style/PeopleTheme">

        <item name="android:listViewStyle">@style/ListViewStyle</item>

    </style>



    <style name="NonPhoneActivityTheme" parent="@android:Theme.Translucent.NoTitleBar">

    </style>