Use contact ID instead of photo ID for group member list

We will be able to avoid doing an extra query of finding
the contact using the lookup key instead of using the
correct ID.

Bug: 5608876
Change-Id: Ica6db5dd01688bb789c732009f5116811b4ebd26
diff --git a/src/com/android/contacts/GroupMemberLoader.java b/src/com/android/contacts/GroupMemberLoader.java
index 7689f8a..1cef4d4 100644
--- a/src/com/android/contacts/GroupMemberLoader.java
+++ b/src/com/android/contacts/GroupMemberLoader.java
@@ -52,7 +52,7 @@
 
     public static class GroupDetailQuery {
         private static final String[] PROJECTION = new String[] {
-            Data.PHOTO_ID,                          // 0
+            Data.CONTACT_ID,                        // 0
             Data.PHOTO_URI,                         // 1
             Data.LOOKUP_KEY,                        // 2
             Data.DISPLAY_NAME_PRIMARY,              // 3
@@ -60,7 +60,7 @@
             Data.CONTACT_STATUS,                    // 5
         };
 
-        public static final int CONTACT_PHOTO_ID             = 0;
+        public static final int CONTACT_ID                   = 0;
         public static final int CONTACT_PHOTO_URI            = 1;
         public static final int CONTACT_LOOKUP_KEY           = 2;
         public static final int CONTACT_DISPLAY_NAME_PRIMARY = 3;
diff --git a/src/com/android/contacts/list/ContactTileAdapter.java b/src/com/android/contacts/list/ContactTileAdapter.java
index b7e2586..27ce433 100644
--- a/src/com/android/contacts/list/ContactTileAdapter.java
+++ b/src/com/android/contacts/list/ContactTileAdapter.java
@@ -157,7 +157,7 @@
          * the correct {@link Cursor}s will be given.
          */
         if (mDisplayType == DisplayType.GROUP_MEMBERS) {
-            mIdIndex = GroupDetailQuery.CONTACT_PHOTO_ID;
+            mIdIndex = GroupDetailQuery.CONTACT_ID;
             mLookupIndex = GroupDetailQuery.CONTACT_LOOKUP_KEY;
             mPhotoUriIndex = GroupDetailQuery.CONTACT_PHOTO_URI;
             mNameIndex = GroupDetailQuery.CONTACT_DISPLAY_NAME_PRIMARY;