commit c00112f667c70df6ce6791c799b11a477392e3af
author Brian Attwell <brianattwell@google.com> Mon Mar 02 18:32:35 2015 -0800
committer Brian Attwell <brianattwell@google.com> Tue Mar 03 10:05:47 2015 -0800
tree 0e6d74b86cae68eea5599114f4867ffe8fccbca9
parent d9f95a1dfe379fb7c9e3b653e84b544d79ecf795

Show checkboxes for all entries except for Me

Bug: 19549465
Change-Id: I676baf82162e09904940f860fce4220f93857454

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

diff --git a/src/com/android/contacts/list/MultiSelectContactsListFragment.java b/src/com/android/contacts/list/MultiSelectContactsListFragment.java
index bdd0a6f..5e17aee 100644
--- a/src/com/android/contacts/list/MultiSelectContactsListFragment.java
+++ b/src/com/android/contacts/list/MultiSelectContactsListFragment.java
@@ -23,6 +23,7 @@
 
 import android.net.Uri;
 import android.os.Bundle;
+import android.text.TextUtils;
 
 import java.util.TreeSet;
 
@@ -102,9 +103,11 @@
             mCheckBoxListListener.onStartDisplayingCheckBoxes();
         }
         final Uri uri = getAdapter().getContactUri(position);
-        if (position > 0 && uri != null) {
+        if (uri != null && (position > 0 || !getAdapter().hasProfile())) {
             final String contactId = uri.getLastPathSegment();
-            getAdapter().toggleSelectionOfContactId(Long.valueOf(contactId));
+            if (!TextUtils.isEmpty(contactId)) {
+                getAdapter().toggleSelectionOfContactId(Long.valueOf(contactId));
+            }
         }
         return true;
     }
@@ -117,7 +120,9 @@
         }
         if (getAdapter().isDisplayingCheckBoxes()) {
             final String contactId = uri.getLastPathSegment();
-            getAdapter().toggleSelectionOfContactId(Long.valueOf(contactId));
+            if (!TextUtils.isEmpty(contactId)) {
+                getAdapter().toggleSelectionOfContactId(Long.valueOf(contactId));
+            }
         } else {
             super.onItemClick(position, id);
         }

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

diff --git a/src/com/android/contacts/list/MultiSelectEntryContactListAdapter.java b/src/com/android/contacts/list/MultiSelectEntryContactListAdapter.java
index 5acd570..39fc4e8 100644
--- a/src/com/android/contacts/list/MultiSelectEntryContactListAdapter.java
+++ b/src/com/android/contacts/list/MultiSelectEntryContactListAdapter.java
@@ -111,10 +111,10 @@
     private void bindCheckBox(ContactListItemView view, Cursor cursor, int position) {
         // Disable clicking on the first entry when showing check boxes. We do this by
         // telling the view to handle clicking itself.
-        view.setClickable(position == 0 && mDisplayCheckBoxes);
-        // Only show checkboxes is mDisplayCheckBoxes is enabled. Also, never show the
-        // checkbox for the first entry in the list (the Me profile).
-        if (position == 0 || !mDisplayCheckBoxes) {
+        view.setClickable(position == 0 && hasProfile() && mDisplayCheckBoxes);
+        // Only show checkboxes if mDisplayCheckBoxes is enabled. Also, never show the
+        // checkbox for the Me profile entry.
+        if (position == 0 && hasProfile() || !mDisplayCheckBoxes) {
             view.hideCheckBox();
             return;
         }