Follow ContactsContract API change
Bug: 16403306
Change-Id: I21d25ba836d9d9ab45a7ebdca0e2f24f8c678e43
diff --git a/src/com/android/contacts/list/EmailAddressListAdapter.java b/src/com/android/contacts/list/EmailAddressListAdapter.java
index 5396364..21b9c60 100644
--- a/src/com/android/contacts/list/EmailAddressListAdapter.java
+++ b/src/com/android/contacts/list/EmailAddressListAdapter.java
@@ -23,7 +23,6 @@
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 @@
} 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,
diff --git a/src/com/android/contacts/list/PostalAddressListAdapter.java b/src/com/android/contacts/list/PostalAddressListAdapter.java
index 35fccfe..5194b69 100644
--- a/src/com/android/contacts/list/PostalAddressListAdapter.java
+++ b/src/com/android/contacts/list/PostalAddressListAdapter.java
@@ -23,7 +23,6 @@
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 @@
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());
diff --git a/tests/src/com/android/contacts/activities/PeopleActivityTest.java b/tests/src/com/android/contacts/activities/PeopleActivityTest.java
index a9eac20..023d48b 100644
--- a/tests/src/com/android/contacts/activities/PeopleActivityTest.java
+++ b/tests/src/com/android/contacts/activities/PeopleActivityTest.java
@@ -23,7 +23,6 @@
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 @@
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();