commit c6ad3abd847682c07d52c97f04ae8a5885148a0b
author Jeff Sharkey <jsharkey@android.com> Tue Jul 21 19:30:15 2009 -0700
committer Jeff Sharkey <jsharkey@android.com> Tue Jul 21 19:34:19 2009 -0700
tree 3361d0c654e6f8ba7e0ba4a2a00af6096602c39c
parent 48cf72be9daba8cc0fbe37666d68c2868eb34285

Refactored to StructuredPostal and RES_PACKAGE.

Matched framework change that refactored StructuredPostal
and RES_PACKAGE, also removal of Groups.PACKAGE_ID.

src/com/android/contacts/ContactsUtils.java

diff --git a/src/com/android/contacts/ContactsUtils.java b/src/com/android/contacts/ContactsUtils.java
index 1db4a1e..5b944cb 100644
--- a/src/com/android/contacts/ContactsUtils.java
+++ b/src/com/android/contacts/ContactsUtils.java
@@ -36,7 +36,7 @@
 import android.provider.ContactsContract.CommonDataKinds.Organization;
 import android.provider.ContactsContract.CommonDataKinds.Phone;
 import android.provider.ContactsContract.CommonDataKinds.Photo;
-import android.provider.ContactsContract.CommonDataKinds.Postal;
+import android.provider.ContactsContract.CommonDataKinds.StructuredPostal;
 import android.provider.Im.ProviderNames;
 import android.database.Cursor;
 import android.text.TextUtils;
@@ -64,9 +64,9 @@
         } else if (Email.CONTENT_ITEM_TYPE.equals(mimeType)) {
             colType = cursor.getColumnIndex(Email.TYPE);
             colLabel = cursor.getColumnIndex(Email.LABEL);
-        } else if (Postal.CONTENT_ITEM_TYPE.equals(mimeType)) {
-            colType = cursor.getColumnIndex(Postal.TYPE);
-            colLabel = cursor.getColumnIndex(Postal.LABEL);
+        } else if (StructuredPostal.CONTENT_ITEM_TYPE.equals(mimeType)) {
+            colType = cursor.getColumnIndex(StructuredPostal.TYPE);
+            colLabel = cursor.getColumnIndex(StructuredPostal.LABEL);
         } else if (Organization.CONTENT_ITEM_TYPE.equals(mimeType)) {
             colType = cursor.getColumnIndex(Organization.TYPE);
             colLabel = cursor.getColumnIndex(Organization.LABEL);
@@ -95,9 +95,9 @@
             defaultType = Email.TYPE_HOME;
             customType = Email.TYPE_CUSTOM;
             arrayResId = com.android.internal.R.array.emailAddressTypes;
-        } else if (Postal.CONTENT_ITEM_TYPE.equals(mimetype)) {
-            defaultType = Postal.TYPE_HOME;
-            customType = Postal.TYPE_CUSTOM;
+        } else if (StructuredPostal.CONTENT_ITEM_TYPE.equals(mimetype)) {
+            defaultType = StructuredPostal.TYPE_HOME;
+            customType = StructuredPostal.TYPE_CUSTOM;
             arrayResId = com.android.internal.R.array.postalAddressTypes;
         } else if (Organization.CONTENT_ITEM_TYPE.equals(mimetype)) {
             defaultType = Organization.TYPE_WORK;