Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 056e4a7b authored by Yorke Lee's avatar Yorke Lee Committed by Android (Google) Code Review
Browse files

Merge "Follow ContactsContract API changes" into lmp-dev

parents 4a9d3573 9d2b6d5b

AndroidManifest.xml

+1 −0
Original line number Diff line number Diff line
@@ -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" />

src/com/android/contacts/list/EmailAddressListAdapter.java

+1 −1
Original line number Diff line number Diff line
@@ -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,

src/com/android/contacts/list/PostalAddressListAdapter.java

+1 −1
Original line number Diff line number Diff line
@@ -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());

tests/src/com/android/contacts/activities/PeopleActivityTest.java

+1 −1
Original line number Diff line number Diff line
@@ -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();