Contacts Picker: Improved efficiency, scrolling, Select All, and search.

- Minimize the use of the cursor.
- Load the contact details upfront.
- Keep the ContactDetails in the adapter.
- Improved search: case-insensitive search within all contact details.

Also temporarily disable photos (will be reinstated in a different way).

Bug: 860467
Change-Id: Ia6ddf396bf20d82ae301489a12795d2fad333af8
Reviewed-on: https://chromium-review.googlesource.com/1221551Reviewed-by: Theresa <twellington@chromium.org>
Commit-Queue: Finnur Thorarinsson <finnur@chromium.org>
Cr-Commit-Position: refs/heads/master@{#592000}

chrome/android/java/src/org/chromium/chrome/browser/contacts_picker/ContactDetails.java

@@ -93,17 +93,21 @@ public class ContactDetails implements Comparable<ContactDetails> {
     public String getContactDetailsAsString() {
         int count = 0;
         StringBuilder builder = new StringBuilder();
-        for (String email : mEmails) {
-            if (count++ > 0) {
-                builder.append("\n");
+        if (mEmails != null) {
+            for (String email : mEmails) {
+                if (count++ > 0) {
+                    builder.append("\n");
+                }
+                builder.append(email);
             }
-            builder.append(email);
         }
-        for (String phoneNumber : mPhoneNumbers) {
-            if (count++ > 0) {
-                builder.append("\n");
+        if (mPhoneNumbers != null) {
+            for (String phoneNumber : mPhoneNumbers) {
+                if (count++ > 0) {
+                    builder.append("\n");
+                }
+                builder.append(phoneNumber);
             }
-            builder.append(phoneNumber);
         }
 
         return builder.toString();
@@ -121,15 +125,19 @@ public class ContactDetails implements Comparable<ContactDetails> {
         writer.name("emails");
 
         writer.beginArray();
-        for (String email : mEmails) {
-            writer.value(email);
+        if (mEmails != null) {
+            for (String email : mEmails) {
+                writer.value(email);
+            }
         }
         writer.endArray();
 
         writer.name("phoneNumbers");
         writer.beginArray();
-        for (String phoneNumber : mPhoneNumbers) {
-            writer.value(phoneNumber);
+        if (mPhoneNumbers != null) {
+            for (String phoneNumber : mPhoneNumbers) {
+                writer.value(phoneNumber);
+            }
         }
         writer.endArray();
 
@@ -148,7 +156,7 @@ public class ContactDetails implements Comparable<ContactDetails> {
 
     @Override
     public int hashCode() {
-        Object[] values = {mId, mDisplayName, mEmails};
+        Object[] values = {mId, mDisplayName};
         return Arrays.hashCode(values);
     }
 

chrome/android/java/src/org/chromium/chrome/browser/contacts_picker/PickerCategoryView.java

@@ -249,7 +249,8 @@ public class PickerCategoryView extends RelativeLayout
         } else if (id == R.id.action) {
             if (mSelectAllMode) {
                 mPreviousSelection = mSelectionDelegate.getSelectedItems();
-                mSelectionDelegate.setSelectedItems(mPickerAdapter.getAllContacts());
+                mSelectionDelegate.setSelectedItems(
+                        new HashSet<ContactDetails>(mPickerAdapter.getAllContacts()));
                 mActionButton.setImageResource(R.drawable.ic_undo);
                 mActionButton.setContentDescription(mLabelUndo);
             } else {