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

diff --git a/src/com/android/contacts/EditContactActivity.java b/src/com/android/contacts/EditContactActivity.java
index 32b55ef..4a62dd5 100644
--- a/src/com/android/contacts/EditContactActivity.java
+++ b/src/com/android/contacts/EditContactActivity.java
@@ -61,8 +61,8 @@
 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.StructuredName;
+import android.provider.ContactsContract.CommonDataKinds.StructuredPostal;
 import android.provider.ContactsContract.Data;
 import android.telephony.PhoneNumberFormattingTextWatcher;
 import android.text.Editable;
@@ -142,7 +142,7 @@
     private static final int DEFAULT_EMAIL_TYPE = Email.TYPE_HOME;
 
     /** The default type for a postal address that is added via an intent */
-    private static final int DEFAULT_POSTAL_TYPE = Postal.TYPE_HOME;
+    private static final int DEFAULT_POSTAL_TYPE = StructuredPostal.TYPE_HOME;
 
     private int mState; // saved across instances
     private boolean mInsert; // saved across instances
@@ -861,7 +861,7 @@
             return resources.getStringArray(android.R.array.phoneTypes);
         } else if (mimetype.equals(Email.CONTENT_ITEM_TYPE)) {
             return resources.getStringArray(android.R.array.emailAddressTypes);
-        } else if (mimetype.equals(Postal.CONTENT_ITEM_TYPE)) {
+        } else if (mimetype.equals(StructuredPostal.CONTENT_ITEM_TYPE)) {
             return resources.getStringArray(android.R.array.postalAddressTypes);
         } else if (mimetype.equals(Im.CONTENT_ITEM_TYPE)) {
             return resources.getStringArray(android.R.array.imProtocols);
@@ -1277,7 +1277,7 @@
                 mNoteEntries.add(entry);
             } else 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)) {
                 int type = aggCursor.getInt(DATA_1_COLUMN);
                 String data = aggCursor.getString(DATA_2_COLUMN);
@@ -1301,7 +1301,7 @@
                     if (isSuperPrimary) {
                         mPrimaryEmailAdded = true;
                     }
-                } else if (mimetype.equals(CommonDataKinds.Postal.CONTENT_ITEM_TYPE)) {
+                } else if (mimetype.equals(CommonDataKinds.StructuredPostal.CONTENT_ITEM_TYPE)) {
                     entry = EditEntry.newPostalEntry(this, label, type, data, uri, id);
                     entry.isPrimary = isSuperPrimary;
                     mPostalEntries.add(entry);
@@ -1930,7 +1930,7 @@
             v.setText(ContactsUtils.getDisplayLabel(context, mimetype, type, label));
             if (mimetype.equals(Im.CONTENT_ITEM_TYPE) && type >= 0) {
                 v.setText(getLabelsForMimetype(activity, mimetype)[type]);
-            } else if (mimetype.equals(Postal.CONTENT_ITEM_TYPE)) {
+            } else if (mimetype.equals(StructuredPostal.CONTENT_ITEM_TYPE)) {
                 v.setMaxLines(3);
             }
             v.setOnClickListener(activity);
@@ -1991,12 +1991,12 @@
                     values.put(CommonDataKinds.Im.PROTOCOL,
                             ContactsUtils.encodeCustomImProtocol(label.toString()));
                 }
-            } else if (mimetype.equals(CommonDataKinds.Postal.CONTENT_ITEM_TYPE)) {
-                if (type != Postal.TYPE_CUSTOM) {
+            } else if (mimetype.equals(CommonDataKinds.StructuredPostal.CONTENT_ITEM_TYPE)) {
+                if (type != StructuredPostal.TYPE_CUSTOM) {
                     labelString = null;
                 }
-                values.put(Postal.LABEL, labelString);
-                values.put(Postal.TYPE, type);
+                values.put(StructuredPostal.LABEL, labelString);
+                values.put(StructuredPostal.TYPE, type);
             } else if (mimetype.equals(CommonDataKinds.Organization.CONTENT_ITEM_TYPE)) {
                 if (type != Organization.TYPE_CUSTOM) {
                     labelString = null;
@@ -2181,8 +2181,8 @@
                 String label, int type, String data, Uri uri, long id) {
             EditEntry entry = new EditEntry(activity, label, type, data, uri, id);
             entry.hint = activity.getString(R.string.ghostData_postal);
-            entry.column = Postal.DATA;
-            entry.mimetype = Postal.CONTENT_ITEM_TYPE;
+            entry.column = StructuredPostal.DATA;
+            entry.mimetype = StructuredPostal.CONTENT_ITEM_TYPE;
             entry.contentType = EditorInfo.TYPE_CLASS_TEXT
                     | EditorInfo.TYPE_TEXT_VARIATION_POSTAL_ADDRESS
                     | EditorInfo.TYPE_TEXT_FLAG_CAP_WORDS