diff options
| -rwxr-xr-x[-rw-r--r--] | src/com/android/contacts/common/list/ContactListFilter.java | 1 | ||||
| -rwxr-xr-x[-rw-r--r--] | src/com/android/contacts/common/list/DefaultContactListAdapter.java | 13 |
2 files changed, 11 insertions, 3 deletions
diff --git a/src/com/android/contacts/common/list/ContactListFilter.java b/src/com/android/contacts/common/list/ContactListFilter.java index f81ea742..b48efb98 100644..100755 --- a/src/com/android/contacts/common/list/ContactListFilter.java +++ b/src/com/android/contacts/common/list/ContactListFilter.java @@ -45,6 +45,7 @@ public final class ContactListFilter implements Comparable<ContactListFilter>, P * TODO: "group" filter and relevant variables are all obsolete. Remove them. */ private static final int FILTER_TYPE_GROUP = 1; + public static final int FILTER_TYPE_ALL_WITHOUT_SIM = 2; private static final String KEY_FILTER_TYPE = "filter.type"; private static final String KEY_ACCOUNT_NAME = "filter.accountName"; diff --git a/src/com/android/contacts/common/list/DefaultContactListAdapter.java b/src/com/android/contacts/common/list/DefaultContactListAdapter.java index ed1c509e..ea177eaf 100644..100755 --- a/src/com/android/contacts/common/list/DefaultContactListAdapter.java +++ b/src/com/android/contacts/common/list/DefaultContactListAdapter.java @@ -100,9 +100,11 @@ public class DefaultContactListAdapter extends ContactListAdapter { } boolean isAirMode = MoreContactUtils.isAPMOnAndSIMPowerDown(getContext()); - if (isAirMode) { - appendUriQueryParameterWithoutSim(loader, RawContacts.ACCOUNT_TYPE, - SimAccountType.ACCOUNT_TYPE); + if (isAirMode + || (null != filter && filter.filterType == + ContactListFilter.FILTER_TYPE_ALL_WITHOUT_SIM)) { + appendUriQueryParameterWithoutSim(loader, + RawContacts.ACCOUNT_TYPE, SimAccountType.ACCOUNT_TYPE); } else { // Do not show contacts when SIM card is disabled String disabledSimFilter = MoreContactUtils.getDisabledSimFilter(); @@ -220,6 +222,11 @@ public class DefaultContactListAdapter extends ContactListAdapter { // We use query parameters for account filter, so no selection to add here. break; } + case ContactListFilter.FILTER_TYPE_ALL_WITHOUT_SIM: { + appendUriQueryParameterWithoutSim(loader, RawContacts.ACCOUNT_TYPE, + SimAccountType.ACCOUNT_TYPE); + break; + } } loader.setSelection(selection.toString()); loader.setSelectionArgs(selectionArgs.toArray(new String[0])); |