diff options
| author | Yorke Lee <yorkelee@google.com> | 2014-09-05 00:20:35 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-09-05 00:20:36 +0000 |
| commit | 056e4a7b42973c0c5c4a35c70b995c007bd68cb7 (patch) | |
| tree | dae29f5100678439892020783ff09430fa005b8e | |
| parent | 4a9d3573786a2f3ef250b574092526fd27bae829 (diff) | |
| parent | 9d2b6d5bcead8c71e96dcd27bc393e9ee0ec656f (diff) | |
| download | packages_apps_Contacts-056e4a7b42973c0c5c4a35c70b995c007bd68cb7.tar.gz packages_apps_Contacts-056e4a7b42973c0c5c4a35c70b995c007bd68cb7.tar.bz2 packages_apps_Contacts-056e4a7b42973c0c5c4a35c70b995c007bd68cb7.zip | |
Merge "Follow ContactsContract API changes" into lmp-dev
4 files changed, 4 insertions, 3 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 06222c9ba..c428e983d 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(); |