commit 06ec1b1429729bb6ee1645571076d97ff55951f5
author Sean Midford <midfords@google.com> Thu Nov 17 19:19:43 2016 +0000
committer Sean Midford <midfords@google.com> Thu Nov 17 19:19:43 2016 +0000
tree 582671d81ca5794c803afecd415d8d8d0fa2d1b7
parent 538c814a828c53cface0220802d86b4d471dd854

Revert "Fixed quick contact button in send to labels"

This reverts commit 538c814a828c53cface0220802d86b4d471dd854.

Change-Id: I6c8ca7a4297f038b88ca5793e7f155153071432b

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

diff --git a/src/com/android/contacts/list/MultiSelectEmailAddressesListAdapter.java b/src/com/android/contacts/list/MultiSelectEmailAddressesListAdapter.java
index a71e49b..af9ee52 100644
--- a/src/com/android/contacts/list/MultiSelectEmailAddressesListAdapter.java
+++ b/src/com/android/contacts/list/MultiSelectEmailAddressesListAdapter.java
@@ -29,7 +29,6 @@
 
 import android.provider.ContactsContract.CommonDataKinds.Email;
 
-import com.android.contacts.common.ContactPhotoManager;
 import com.android.contacts.common.list.ContactListItemView;
 import com.android.contacts.common.list.MultiSelectEntryContactListAdapter;
 import com.android.contacts.common.preference.ContactsPreferences;
@@ -163,7 +162,9 @@
         bindViewId(view, cursor, EmailQuery.EMAIL_ID);
         if (isFirstEntry) {
             bindName(view, cursor);
-            bindPhoto(view, cursor);
+            bindQuickContact(view, partition, cursor, EmailQuery.PHOTO_ID,
+                    EmailQuery.PHOTO_URI, EmailQuery.CONTACT_ID,
+                    EmailQuery.LOOKUP_KEY, EmailQuery.DISPLAY_NAME);
         } else {
             unbindName(view);
             view.removePhotoView(true, false);
@@ -171,17 +172,6 @@
         bindEmailAddress(view, cursor);
     }
 
-    protected void bindPhoto(final ContactListItemView view, Cursor cursor) {
-        final long photoId = cursor.isNull(EmailQuery.PHOTO_ID)
-                ? 0 : cursor.getLong(EmailQuery.PHOTO_ID);
-        final ContactPhotoManager.DefaultImageRequest imageRequest = photoId == 0
-                ? getDefaultImageRequestFromCursor(cursor, EmailQuery.DISPLAY_NAME,
-                EmailQuery.LOOKUP_KEY)
-                : null;
-        getPhotoLoader().loadThumbnail(view.getPhotoView(), photoId, false, getCircularPhotos(),
-                imageRequest);
-    }
-
     protected void unbindName(final ContactListItemView view) {
         view.hideDisplayName();
     }

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

diff --git a/src/com/android/contacts/list/MultiSelectPhoneNumbersListAdapter.java b/src/com/android/contacts/list/MultiSelectPhoneNumbersListAdapter.java
index 5dc9c17..985809b 100644
--- a/src/com/android/contacts/list/MultiSelectPhoneNumbersListAdapter.java
+++ b/src/com/android/contacts/list/MultiSelectPhoneNumbersListAdapter.java
@@ -29,7 +29,6 @@
 
 import android.provider.ContactsContract.CommonDataKinds.Phone;
 
-import com.android.contacts.common.ContactPhotoManager;
 import com.android.contacts.common.list.ContactListItemView;
 import com.android.contacts.common.list.MultiSelectEntryContactListAdapter;
 import com.android.contacts.common.preference.ContactsPreferences;
@@ -163,7 +162,9 @@
         bindViewId(view, cursor, PhoneQuery.PHONE_ID);
         if (isFirstEntry) {
             bindName(view, cursor);
-            bindPhoto(view, cursor);
+            bindQuickContact(view, partition, cursor, PhoneQuery.PHOTO_ID,
+                        PhoneQuery.PHOTO_URI, PhoneQuery.CONTACT_ID,
+                        PhoneQuery.LOOKUP_KEY, PhoneQuery.DISPLAY_NAME);
         } else {
             unbindName(view);
             view.removePhotoView(true, false);
@@ -171,17 +172,6 @@
         bindPhoneNumber(view, cursor);
     }
 
-    protected void bindPhoto(final ContactListItemView view, Cursor cursor) {
-        final long photoId = cursor.isNull(PhoneQuery.PHOTO_ID)
-                ? 0 : cursor.getLong(PhoneQuery.PHOTO_ID);
-        final ContactPhotoManager.DefaultImageRequest imageRequest = photoId == 0
-                ? getDefaultImageRequestFromCursor(cursor, PhoneQuery.DISPLAY_NAME,
-                PhoneQuery.LOOKUP_KEY)
-                : null;
-        getPhotoLoader().loadThumbnail(view.getPhotoView(), photoId, false, getCircularPhotos(),
-                imageRequest);
-    }
-
     protected void unbindName(final ContactListItemView view) {
         view.hideDisplayName();
     }