summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYorke Lee <yorkelee@google.com>2014-09-04 14:58:56 -0700
committerYorke Lee <yorkelee@google.com>2014-09-04 16:05:42 -0700
commit9d2b6d5bcead8c71e96dcd27bc393e9ee0ec656f (patch)
tree3c30797cc29d1ae63f8f24a748b7358ba515c10d
parentc8bd00d2119313e454b2ef55ffaf04db3e257120 (diff)
downloadpackages_apps_Contacts-9d2b6d5bcead8c71e96dcd27bc393e9ee0ec656f.tar.gz
packages_apps_Contacts-9d2b6d5bcead8c71e96dcd27bc393e9ee0ec656f.tar.bz2
packages_apps_Contacts-9d2b6d5bcead8c71e96dcd27bc393e9ee0ec656f.zip
Follow ContactsContract API changes
Bug: 17390425 Change-Id: Ic35a5b599ec347848128d7babfdcd7151ede6a2e
-rw-r--r--AndroidManifest.xml1
-rw-r--r--src/com/android/contacts/list/EmailAddressListAdapter.java2
-rw-r--r--src/com/android/contacts/list/PostalAddressListAdapter.java2
-rw-r--r--tests/src/com/android/contacts/activities/PeopleActivityTest.java2
4 files changed, 4 insertions, 3 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 045768115..3594328ed 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -251,6 +251,7 @@
<intent-filter>
<action android:name="com.android.contacts.action.QUICK_CONTACT" />
+ <action android:name="android.provider.action.QUICK_CONTACT" />
<category android:name="android.intent.category.DEFAULT" />
<data android:mimeType="vnd.android.cursor.item/contact" />
<data android:mimeType="vnd.android.cursor.item/person" />
diff --git a/src/com/android/contacts/list/EmailAddressListAdapter.java b/src/com/android/contacts/list/EmailAddressListAdapter.java
index 21b9c60c7..80a35a7d5 100644
--- a/src/com/android/contacts/list/EmailAddressListAdapter.java
+++ b/src/com/android/contacts/list/EmailAddressListAdapter.java
@@ -86,7 +86,7 @@ public class EmailAddressListAdapter extends ContactEntryListAdapter {
} else {
builder = Email.CONTENT_URI.buildUpon();
if (isSectionHeaderDisplayEnabled()) {
- builder.appendQueryParameter(Email.ADDRESS_BOOK_INDEX_EXTRAS, "true");
+ builder.appendQueryParameter(Email.EXTRA_ADDRESS_BOOK_INDEX, "true");
}
}
builder.appendQueryParameter(ContactsContract.DIRECTORY_PARAM_KEY,
diff --git a/src/com/android/contacts/list/PostalAddressListAdapter.java b/src/com/android/contacts/list/PostalAddressListAdapter.java
index 5194b698d..4856d747e 100644
--- a/src/com/android/contacts/list/PostalAddressListAdapter.java
+++ b/src/com/android/contacts/list/PostalAddressListAdapter.java
@@ -80,7 +80,7 @@ public class PostalAddressListAdapter extends ContactEntryListAdapter {
final Builder builder = StructuredPostal.CONTENT_URI.buildUpon()
.appendQueryParameter(ContactsContract.REMOVE_DUPLICATE_ENTRIES, "true");
if (isSectionHeaderDisplayEnabled()) {
- builder.appendQueryParameter(StructuredPostal.ADDRESS_BOOK_INDEX_EXTRAS, "true");
+ builder.appendQueryParameter(StructuredPostal.EXTRA_ADDRESS_BOOK_INDEX, "true");
}
loader.setUri(builder.build());
diff --git a/tests/src/com/android/contacts/activities/PeopleActivityTest.java b/tests/src/com/android/contacts/activities/PeopleActivityTest.java
index 023d48bd0..84dc74805 100644
--- a/tests/src/com/android/contacts/activities/PeopleActivityTest.java
+++ b/tests/src/com/android/contacts/activities/PeopleActivityTest.java
@@ -139,7 +139,7 @@ public class PeopleActivityTest
private void expectContactListQuery(int count) {
Uri uri = Contacts.CONTENT_URI.buildUpon()
- .appendQueryParameter(Contacts.ADDRESS_BOOK_INDEX_EXTRAS, "true")
+ .appendQueryParameter(Contacts.EXTRA_ADDRESS_BOOK_INDEX, "true")
.appendQueryParameter(ContactsContract.DIRECTORY_PARAM_KEY,
String.valueOf(Directory.DEFAULT))
.build();