commit 06bd5a8726e8c0897f05726cf1f61cc04e88ee24
author Jeff Sharkey <jsharkey@android.com> Mon Jun 15 20:06:48 2009 -0700
committer Jeff Sharkey <jsharkey@android.com> Wed Jun 24 18:33:48 2009 -0700
tree c062dded8a9efa75690cb6981a06306498ce22cd
parent d7c4af2b932ffc65476fb1ac6d74feac74b48f3c

Fix up constants that changed in framework contract.

src/com/android/contacts/ContactEntryAdapter.java

diff --git a/src/com/android/contacts/ContactEntryAdapter.java b/src/com/android/contacts/ContactEntryAdapter.java
index aac578d..2f8b109 100644
--- a/src/com/android/contacts/ContactEntryAdapter.java
+++ b/src/com/android/contacts/ContactEntryAdapter.java
@@ -20,6 +20,7 @@
 import android.net.Uri;
 import android.os.Parcel;
 import android.provider.ContactsContract.Aggregates;
+import android.provider.ContactsContract.Contacts;
 import android.provider.ContactsContract.Data;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -36,7 +37,7 @@
         Aggregates.STARRED, //1
         Data._ID, //2
         Data.CONTACT_ID, //3
-        Data.PACKAGE, //4
+        Contacts.PACKAGE, //4
         Data.MIMETYPE, //5
         Data.IS_PRIMARY, //6
         Data.IS_SUPER_PRIMARY, //7

src/com/android/contacts/FastTrackWindow.java

diff --git a/src/com/android/contacts/FastTrackWindow.java b/src/com/android/contacts/FastTrackWindow.java
index 63ba476..b96cf16 100644
--- a/src/com/android/contacts/FastTrackWindow.java
+++ b/src/com/android/contacts/FastTrackWindow.java
@@ -37,6 +37,7 @@
 import android.provider.Contacts.Phones;
 import android.provider.ContactsContract.Aggregates;
 import android.provider.ContactsContract.CommonDataKinds;
+import android.provider.ContactsContract.Contacts;
 import android.provider.ContactsContract.Data;
 import android.provider.ContactsContract.Presence;
 import android.provider.ContactsContract.CommonDataKinds.Email;
@@ -573,7 +574,7 @@
      */
     private void handleData(Cursor cursor) {
         final int colId = cursor.getColumnIndex(Data._ID);
-        final int colPackage = cursor.getColumnIndex(Data.PACKAGE);
+        final int colPackage = cursor.getColumnIndex(Contacts.PACKAGE);
         final int colMimeType = cursor.getColumnIndex(Data.MIMETYPE);
         final int colPhoto = cursor.getColumnIndex(Photo.PHOTO);
 

src/com/android/contacts/SplitAggregateView.java

diff --git a/src/com/android/contacts/SplitAggregateView.java b/src/com/android/contacts/SplitAggregateView.java
index 8d20b6c..fde2b86 100644
--- a/src/com/android/contacts/SplitAggregateView.java
+++ b/src/com/android/contacts/SplitAggregateView.java
@@ -22,6 +22,7 @@
 import android.database.Cursor;
 import android.graphics.Bitmap;
 import android.net.Uri;
+import android.provider.ContactsContract.Contacts;
 import android.provider.ContactsContract.Aggregates.Data;
 import android.provider.ContactsContract.CommonDataKinds.Email;
 import android.provider.ContactsContract.CommonDataKinds.Nickname;
@@ -49,8 +50,8 @@
 public class SplitAggregateView extends ListView {
 
     private static final String[] AGGREGATE_DATA_PROJECTION = new String[] {
-            Data.MIMETYPE, Data.PACKAGE, Data.CONTACT_ID, Data.DATA1, Data.DATA2, Data.IS_PRIMARY,
-            StructuredName.DISPLAY_NAME
+            Data.MIMETYPE, Contacts.PACKAGE, Data.CONTACT_ID, Data.DATA1, Data.DATA2,
+            Data.IS_PRIMARY, StructuredName.DISPLAY_NAME
     };
 
     private static final int COL_MIMETYPE = 0;