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

Commit 5b0af77f authored by Walter Jang's avatar Walter Jang Committed by Android (Google) Code Review
Browse files

Merge "Contacts to display preference UI tweaks (1/2)"

parents 0e14d655 b8e90f1a

src/com/android/contacts/ContactsDrawerActivity.java

+1 −1
Original line number Diff line number Diff line
@@ -497,7 +497,7 @@ public abstract class ContactsDrawerActivity extends AppCompatContactsActivity i 


    protected void updateFilterMenu(ContactListFilter filter) {

        clearCheckedMenus();

        if (ContactListFilter.isContactsFilterType(filter)) {

        if (filter != null && filter.isContactsFilterType()) {

            if (mIdMenuMap != null && mIdMenuMap.get(R.id.nav_all_contacts) != null) {

                mIdMenuMap.get(R.id.nav_all_contacts).setCheckable(true);

                mIdMenuMap.get(R.id.nav_all_contacts).setChecked(true);

src/com/android/contacts/activities/PeopleActivity.java

+1 −1
Original line number Diff line number Diff line
@@ -1424,7 +1424,7 @@ public class PeopleActivity extends ContactsDrawerActivity implements 
    }



    private boolean isAllContactsFilter(ContactListFilter filter) {

        return ContactListFilter.isContactsFilterType(filter);

        return filter != null && filter.isContactsFilterType();

    }



    private boolean isDeviceContactsFilter(ContactListFilter filter) {