commit e1cd6791d62fc1328b97034b0e07e592d94af175
author Dmitri Plotnikov <dplotnikov@google.com> Mon Jul 27 20:28:17 2009 -0700
committer Dmitri Plotnikov <dplotnikov@google.com> Mon Jul 27 20:28:17 2009 -0700
tree e5ec188a428ad8032bc2161332eb5da3c1afd4fc
parent 39466593586d2d15fc2e9fa8f0d1cd39d35ea3d9

Contacts: renaming Aggregates to Contacts

src/com/android/contacts/SocialStreamActivity.java

diff --git a/src/com/android/contacts/SocialStreamActivity.java b/src/com/android/contacts/SocialStreamActivity.java
index 65c9932..ae22adf 100644
--- a/src/com/android/contacts/SocialStreamActivity.java
+++ b/src/com/android/contacts/SocialStreamActivity.java
@@ -41,7 +41,7 @@
 import android.net.Uri;
 import android.os.Bundle;
 import android.provider.ContactsContract;
-import android.provider.ContactsContract.Aggregates;
+import android.provider.ContactsContract.Contacts;
 import android.provider.ContactsContract.CommonDataKinds;
 import android.provider.ContactsContract.Data;
 import android.provider.ContactsContract.RawContacts;
@@ -77,8 +77,8 @@
         Activities.RES_PACKAGE,
         Activities.MIMETYPE,
         Activities.AUTHOR_CONTACT_ID,
-        RawContacts.AGGREGATE_ID,
-        Aggregates.DISPLAY_NAME,
+        RawContacts.CONTACT_ID,
+        Contacts.DISPLAY_NAME,
         Activities.PUBLISHED,
         Activities.TITLE,
         Activities.SUMMARY,
@@ -166,7 +166,7 @@
     private Rect mRect = new Rect();
 
     private void showFastTrack(View anchor, long aggId) {
-        Uri aggUri = ContentUris.withAppendedId(ContactsContract.Aggregates.CONTENT_URI, aggId);
+        Uri aggUri = ContentUris.withAppendedId(ContactsContract.Contacts.CONTENT_URI, aggId);
 
         anchor.getLocationInWindow(mLocation);
         mRect.left = mLocation[0];
@@ -365,12 +365,12 @@
 
         private static final String[] PROJ_DETAILS = new String[] {
             Data.MIMETYPE,
-            Data.CONTACT_ID,
+            Data.RAW_CONTACT_ID,
             Photo.PHOTO,
         };
 
         private static final int COL_MIMETYPE = 0;
-        private static final int COL_CONTACT_ID = 1;
+        private static final int COL_RAW_CONTACT_ID = 1;
         private static final int COL_PHOTO = 2;
 
         private HashMap<Long, Bitmap> mPhoto = new HashMap<Long, Bitmap>();
@@ -383,7 +383,7 @@
                     Data.MIMETYPE + "=?", new String[] { Photo.CONTENT_ITEM_TYPE }, null);
 
             while (cursor.moveToNext()) {
-                long contactId = cursor.getLong(COL_CONTACT_ID);
+                long contactId = cursor.getLong(COL_RAW_CONTACT_ID);
                 String mimeType = cursor.getString(COL_MIMETYPE);
                 if (Photo.CONTENT_ITEM_TYPE.equals(mimeType)) {
                     byte[] photoBlob = cursor.getBlob(COL_PHOTO);