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

Commit 056fe775 authored by Yorke Lee's avatar Yorke Lee Committed by Android Git Automerger
Browse files

am 76939f7f: Follow ContactsContract API change 

* commit '76939f7f':
  Follow ContactsContract API change
parents 946b25e4 76939f7f

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

+1 −2
Original line number Diff line number Diff line
@@ -23,7 +23,6 @@ import android.net.Uri; 
import android.net.Uri.Builder;

import android.provider.ContactsContract;

import android.provider.ContactsContract.CommonDataKinds.Email;

import android.provider.ContactsContract.ContactCounts;

import android.provider.ContactsContract.Data;

import android.text.TextUtils;

import android.view.View;
@@ -87,7 +86,7 @@ public class EmailAddressListAdapter extends ContactEntryListAdapter { 
        } else {

            builder = Email.CONTENT_URI.buildUpon();

            if (isSectionHeaderDisplayEnabled()) {

                builder.appendQueryParameter(ContactCounts.ADDRESS_BOOK_INDEX_EXTRAS, "true");

                builder.appendQueryParameter(Email.ADDRESS_BOOK_INDEX_EXTRAS, "true");

            }

        }

        builder.appendQueryParameter(ContactsContract.DIRECTORY_PARAM_KEY,

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

+1 −2
Original line number Diff line number Diff line
@@ -23,7 +23,6 @@ import android.net.Uri; 
import android.net.Uri.Builder;

import android.provider.ContactsContract;

import android.provider.ContactsContract.CommonDataKinds.StructuredPostal;

import android.provider.ContactsContract.ContactCounts;

import android.provider.ContactsContract.Data;

import android.view.View;

import android.view.ViewGroup;
@@ -81,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(ContactCounts.ADDRESS_BOOK_INDEX_EXTRAS, "true");

            builder.appendQueryParameter(StructuredPostal.ADDRESS_BOOK_INDEX_EXTRAS, "true");

        }

        loader.setUri(builder.build());

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

+1 −2
Original line number Diff line number Diff line
@@ -23,7 +23,6 @@ import android.content.Loader; 
import android.net.Uri;

import android.os.AsyncTask;

import android.provider.ContactsContract;

import android.provider.ContactsContract.ContactCounts;

import android.provider.ContactsContract.Contacts;

import android.provider.ContactsContract.Directory;

import android.provider.ContactsContract.Groups;
@@ -140,7 +139,7 @@ public class PeopleActivityTest 


    private void expectContactListQuery(int count) {

        Uri uri = Contacts.CONTENT_URI.buildUpon()

                .appendQueryParameter(ContactCounts.ADDRESS_BOOK_INDEX_EXTRAS, "true")

                .appendQueryParameter(Contacts.ADDRESS_BOOK_INDEX_EXTRAS, "true")

                .appendQueryParameter(ContactsContract.DIRECTORY_PARAM_KEY,

                        String.valueOf(Directory.DEFAULT))

                .build();