commit 23411b233966730de4e23d07edb871238cf891f2
author Dmitri Plotnikov <dplotnikov@google.com> Tue Dec 21 17:53:10 2010 -0800
committer Dmitri Plotnikov <dplotnikov@google.com> Tue Dec 21 17:54:28 2010 -0800
tree 3c04a245bf30be08a6063cbedd4e77a72c20b32f
parent 192a1387fb364963ff313bdbc866e914d4188790

Fixing contact list definition for contact join activity

It was using obsolete API, IN_VISIBLE_GROUP instead of
the new API, which is "directory=0"

Change-Id: I1155e1cbc7f3edb3f77542c57422e93d2882198b

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

diff --git a/src/com/android/contacts/list/JoinContactListAdapter.java b/src/com/android/contacts/list/JoinContactListAdapter.java
index 07c996e..c59ac2f 100644
--- a/src/com/android/contacts/list/JoinContactListAdapter.java
+++ b/src/com/android/contacts/list/JoinContactListAdapter.java
@@ -26,6 +26,7 @@
 import android.provider.ContactsContract;
 import android.provider.ContactsContract.Contacts;
 import android.provider.ContactsContract.Contacts.AggregationSuggestions;
+import android.provider.ContactsContract.Directory;
 import android.text.TextUtils;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -98,8 +99,12 @@
 
         // TODO simplify projection
         loader.setProjection(PROJECTION_CONTACT);
-        loader.setUri(buildSectionIndexerUri(Contacts.CONTENT_URI));
-        loader.setSelection(Contacts.IN_VISIBLE_GROUP + "=1 AND " + Contacts._ID + "!=?");
+        Uri allContactsUri = buildSectionIndexerUri(Contacts.CONTENT_URI).buildUpon()
+                .appendQueryParameter(
+                        ContactsContract.DIRECTORY_PARAM_KEY, String.valueOf(Directory.DEFAULT))
+                .build();
+        loader.setUri(allContactsUri);
+        loader.setSelection(Contacts._ID + "!=?");
         loader.setSelectionArgs(new String[]{String.valueOf(mTargetContactId)});
         if (getSortOrder() == ContactsContract.Preferences.SORT_ORDER_PRIMARY) {
             loader.setSortOrder(Contacts.SORT_KEY_PRIMARY);