Support for LIST_ALL_CONTACTS Intent
In the new navigation model this will switch
from the currently selected contact filter
the "All contacts" filter.
Change-Id: I946c7097b54ca65509c2a4ce33f5eea66d29e63e
diff --git a/src/com/android/contacts/activities/ContactBrowserActivity.java b/src/com/android/contacts/activities/ContactBrowserActivity.java
index 27fdb60..2deb549 100644
--- a/src/com/android/contacts/activities/ContactBrowserActivity.java
+++ b/src/com/android/contacts/activities/ContactBrowserActivity.java
@@ -241,6 +241,9 @@
mContactListFilterController.setContactListFilter(new ContactListFilter(
ContactListFilter.FILTER_TYPE_WITH_PHONE_NUMBERS_ONLY), false);
searchMode = false;
+ } else if (mRequest.getActionCode() == ContactsRequest.ACTION_ALL_CONTACTS) {
+ mContactListFilterController.setContactListFilter(new ContactListFilter(
+ ContactListFilter.FILTER_TYPE_ALL_ACCOUNTS), false);
}
} else {
if (mHasActionBar) {
diff --git a/src/com/android/contacts/list/ContactsIntentResolver.java b/src/com/android/contacts/list/ContactsIntentResolver.java
index d1525fb..2386cc6 100644
--- a/src/com/android/contacts/list/ContactsIntentResolver.java
+++ b/src/com/android/contacts/list/ContactsIntentResolver.java
@@ -53,7 +53,6 @@
public ContactsRequest resolveIntent(Intent intent) {
ContactsRequest request = new ContactsRequest();
- request.setDisplayOnlyVisible(true);
String action = intent.getAction();
@@ -62,8 +61,7 @@
if (UI.LIST_DEFAULT.equals(action) ) {
request.setActionCode(ContactsRequest.ACTION_DEFAULT);
} else if (UI.LIST_ALL_CONTACTS_ACTION.equals(action)) {
- request.setActionCode(ContactsRequest.ACTION_DEFAULT);
- request.setDisplayOnlyVisible(false);
+ request.setActionCode(ContactsRequest.ACTION_ALL_CONTACTS);
} else if (UI.LIST_CONTACTS_WITH_PHONES_ACTION.equals(action)) {
request.setActionCode(ContactsRequest.ACTION_DEFAULT);
request.setDisplayWithPhoneNumbersOnly(true);
diff --git a/src/com/android/contacts/list/ContactsRequest.java b/src/com/android/contacts/list/ContactsRequest.java
index 331dc93..21e66ac 100644
--- a/src/com/android/contacts/list/ContactsRequest.java
+++ b/src/com/android/contacts/list/ContactsRequest.java
@@ -29,6 +29,9 @@
/** Default mode: browse contacts */
public static final int ACTION_DEFAULT = 10;
+ /** Show all contacts */
+ public static final int ACTION_ALL_CONTACTS = 15;
+
/** Show contents of a specific group */
public static final int ACTION_GROUP = 20;
@@ -75,7 +78,6 @@
private boolean mSearchMode;
private String mQueryString;
private boolean mDisplayOnlyWithPhones;
- private boolean mDisplayOnlyVisible;
private String mGroupName;
private boolean mLegacyCompatibilityMode;
private boolean mDirectorySearchEnabled = true;
@@ -92,7 +94,6 @@
mSearchMode = request.mSearchMode;
mQueryString = request.mQueryString;
mDisplayOnlyWithPhones = request.mDisplayOnlyWithPhones;
- mDisplayOnlyVisible = request.mDisplayOnlyVisible;
mGroupName = request.mGroupName;
mLegacyCompatibilityMode = request.mLegacyCompatibilityMode;
mDirectorySearchEnabled = request.mDirectorySearchEnabled;
@@ -115,7 +116,6 @@
request.mSearchMode = source.readInt() != 0;
request.mQueryString = source.readString();
request.mDisplayOnlyWithPhones = source.readInt() != 0;
- request.mDisplayOnlyVisible = source.readInt() != 0;
request.mGroupName = source.readString();
request.mLegacyCompatibilityMode = source.readInt() != 0;
request.mDirectorySearchEnabled = source.readInt() != 0;
@@ -132,7 +132,6 @@
dest.writeInt(mSearchMode ? 1 : 0);
dest.writeString(mQueryString);
dest.writeInt(mDisplayOnlyWithPhones ? 1 : 0);
- dest.writeInt(mDisplayOnlyVisible ? 1 : 0);
dest.writeString(mGroupName);
dest.writeInt(mLegacyCompatibilityMode ? 1 : 0);
dest.writeInt(mDirectorySearchEnabled ? 1 : 0);
@@ -175,14 +174,6 @@
mActionCode = actionCode;
}
- public boolean getDisplayOnlyVisible() {
- return mDisplayOnlyVisible;
- }
-
- public void setDisplayOnlyVisible(boolean flag) {
- mDisplayOnlyVisible = flag;
- }
-
public boolean getDisplayWithPhoneNumbersOnly() {
return mDisplayOnlyWithPhones;
}