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/ViewContactActivity.java

diff --git a/src/com/android/contacts/ViewContactActivity.java b/src/com/android/contacts/ViewContactActivity.java
index 46cd26b..35710b5 100644
--- a/src/com/android/contacts/ViewContactActivity.java
+++ b/src/com/android/contacts/ViewContactActivity.java
@@ -390,7 +390,7 @@
             if (entry.primaryIcon == -1) {
                 menu.add(0, MENU_ITEM_MAKE_DEFAULT, 0, R.string.menu_makeDefaultEmail);
             }
-        } else if (entry.mimetype.equals(CommonDataKinds.Postal.CONTENT_ITEM_TYPE)) {
+        } else if (entry.mimetype.equals(CommonDataKinds.StructuredPostal.CONTENT_ITEM_TYPE)) {
             menu.add(0, 0, 0, R.string.menu_viewAddress).setIntent(entry.intent);
         }
         // TODO(emillar): add back with group support.
@@ -722,7 +722,7 @@
 
                 if (mimetype.equals(CommonDataKinds.Phone.CONTENT_ITEM_TYPE)
                         || mimetype.equals(CommonDataKinds.Email.CONTENT_ITEM_TYPE)
-                        || mimetype.equals(CommonDataKinds.Postal.CONTENT_ITEM_TYPE)
+                        || mimetype.equals(CommonDataKinds.StructuredPostal.CONTENT_ITEM_TYPE)
                         || mimetype.equals(CommonDataKinds.Im.CONTENT_ITEM_TYPE)) {
                     final int type = aggCursor.getInt(DATA_1_COLUMN);
                     final String label = aggCursor.getString(DATA_3_COLUMN);
@@ -783,7 +783,7 @@
                         }
                         mEmailEntries.add(entry);
                     // Build postal entries
-                    } else if (mimetype.equals(CommonDataKinds.Postal.CONTENT_ITEM_TYPE)) {
+                    } else if (mimetype.equals(CommonDataKinds.StructuredPostal.CONTENT_ITEM_TYPE)) {
                         entry.label = buildActionString(R.string.actionMap,
                                 ContactsUtils.getDisplayLabel(this, mimetype, type, label), true);
                         entry.data = data;