commit b8e90f1aa85e461afad53c20ea0da902606bde60
author Walter Jang <wjang@google.com> Mon Jul 18 18:25:32 2016 -0700
committer Walter Jang <wjang@google.com> Mon Jul 18 18:38:31 2016 -0700
tree aa038cca370e31da89b9d1b430afe69040c47396
parent 3d8803e4d597da33275b4a67271cb74fed2cdea8

Contacts to display preference UI tweaks (1/2)

Use non-static version of ContactListFilter.isContactsFilterType

Bug 29185471

Change-Id: Id1a6d86959357defac771a05cf3101ae5df85f33

src/com/android/contacts/ContactsDrawerActivity.java

diff --git a/src/com/android/contacts/ContactsDrawerActivity.java b/src/com/android/contacts/ContactsDrawerActivity.java
index 3ae009e..b62d5e6 100644
--- a/src/com/android/contacts/ContactsDrawerActivity.java
+++ b/src/com/android/contacts/ContactsDrawerActivity.java
@@ -497,7 +497,7 @@
 
     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

diff --git a/src/com/android/contacts/activities/PeopleActivity.java b/src/com/android/contacts/activities/PeopleActivity.java
index fadede6..6c2656d 100644
--- a/src/com/android/contacts/activities/PeopleActivity.java
+++ b/src/com/android/contacts/activities/PeopleActivity.java
@@ -1424,7 +1424,7 @@
     }
 
     private boolean isAllContactsFilter(ContactListFilter filter) {
-        return ContactListFilter.isContactsFilterType(filter);
+        return filter != null && filter.isContactsFilterType();
     }
 
     private boolean isDeviceContactsFilter(ContactListFilter filter) {