Filter SIM contacts when disabled

- filter SIM contacts when set photo from gallery
- filter SIM contacts when join contacts
- change MultipickActivity background to holo light

Change-Id: I4b6569880f83e8a098293032e33e653c8053d112

3 files changed, 17 insertions, 3 deletions

diff --git a/src/com/android/contacts/editor/MultiPickContactActivity.java b/src/com/android/contacts/editor/MultiPickContactActivity.java
index 8d42e2be5..23bab2d25 100644
--- a/src/com/android/contacts/editor/MultiPickContactActivity.java
+++ b/src/com/android/contacts/editor/MultiPickContactActivity.java
@@ -738,7 +738,7 @@ public class MultiPickContactActivity extends ListActivity implements
                     exitSearchMode(true);
                 }
                 if (mMode == MODE_DEFAULT_CONTACT) {
-                    if (Intent.ACTION_GET_CONTENT.equals(getIntent().getAction())) {
+                    if (ACTION_MULTI_PICK.equals(getIntent().getAction())) {
                         if (mChoiceSet.size() > MAX_CONTACTS_NUM_TO_SELECT_ONCE) {
                             Toast.makeText(
                                     mContext,
diff --git a/src/com/android/contacts/list/ContactPickerFragment.java b/src/com/android/contacts/list/ContactPickerFragment.java
index 3dc4330db..1fbf7657b 100644
--- a/src/com/android/contacts/list/ContactPickerFragment.java
+++ b/src/com/android/contacts/list/ContactPickerFragment.java
@@ -153,8 +153,13 @@ public class ContactPickerFragment extends ContactEntryListFragment<ContactEntry
     protected ContactEntryListAdapter createListAdapter() {
         if (!isLegacyCompatibilityMode()) {
             DefaultContactListAdapter adapter = new DefaultContactListAdapter(getActivity());
-            adapter.setFilter(ContactListFilter.createFilterWithType(
-                    ContactListFilter.FILTER_TYPE_ALL_ACCOUNTS));
+            if (!mCreateContactEnabled) {
+                adapter.setFilter(ContactListFilter.createFilterWithType(
+                        ContactListFilter.FILTER_TYPE_ALL_WITHOUT_SIM));
+            } else {
+                adapter.setFilter(ContactListFilter.createFilterWithType(
+                        ContactListFilter.FILTER_TYPE_ALL_ACCOUNTS));
+            }
             adapter.setSectionHeaderDisplayEnabled(true);
             adapter.setDisplayPhotos(true);
             adapter.setQuickContactEnabled(false);
diff --git a/src/com/android/contacts/list/JoinContactListAdapter.java b/src/com/android/contacts/list/JoinContactListAdapter.java
index 88259c1de..e549b7b24 100644
--- a/src/com/android/contacts/list/JoinContactListAdapter.java
+++ b/src/com/android/contacts/list/JoinContactListAdapter.java
@@ -24,6 +24,7 @@ import android.provider.ContactsContract;
 import android.provider.ContactsContract.Contacts;
 import android.provider.ContactsContract.Contacts.AggregationSuggestions;
 import android.provider.ContactsContract.Directory;
+import android.provider.ContactsContract.RawContacts;
 import android.text.TextUtils;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -33,7 +34,9 @@ import android.widget.TextView;
 import com.android.contacts.R;
 import com.android.contacts.common.list.ContactListAdapter;
 import com.android.contacts.common.list.ContactListItemView;
+import com.android.contacts.common.list.DefaultContactListAdapter;
 import com.android.contacts.common.list.DirectoryListLoader;
+import com.android.contacts.common.model.account.SimAccountType;
 
 public class JoinContactListAdapter extends ContactListAdapter {
 
@@ -80,6 +83,8 @@ public class JoinContactListAdapter extends ContactListAdapter {
         }
 
         builder.appendQueryParameter("limit", String.valueOf(MAX_SUGGESTIONS));
+        builder.appendQueryParameter(RawContacts.ACCOUNT_TYPE, SimAccountType.ACCOUNT_TYPE);
+        builder.appendQueryParameter(DefaultContactListAdapter.WITHOUT_SIM_FLAG, "true");
 
         loader.setSuggestionUri(builder.build());
 
@@ -91,11 +96,15 @@ public class JoinContactListAdapter extends ContactListAdapter {
                 .appendEncodedPath(Uri.encode(filter))
                 .appendQueryParameter(
                         ContactsContract.DIRECTORY_PARAM_KEY, String.valueOf(Directory.DEFAULT))
+                .appendQueryParameter(RawContacts.ACCOUNT_TYPE, SimAccountType.ACCOUNT_TYPE)
+                .appendQueryParameter(DefaultContactListAdapter.WITHOUT_SIM_FLAG, "true")
                 .build();
         } else {
             allContactsUri = buildSectionIndexerUri(Contacts.CONTENT_URI).buildUpon()
                 .appendQueryParameter(
                         ContactsContract.DIRECTORY_PARAM_KEY, String.valueOf(Directory.DEFAULT))
+                .appendQueryParameter(RawContacts.ACCOUNT_TYPE, SimAccountType.ACCOUNT_TYPE)
+                .appendQueryParameter(DefaultContactListAdapter.WITHOUT_SIM_FLAG, "true")
                 .build();
         }
         loader.setUri(allContactsUri);