summaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorJeff Sharkey <jsharkey@android.com>2009-08-11 17:33:48 -0700
committerJeff Sharkey <jsharkey@android.com>2009-08-12 09:54:19 -0700
commit62b83b7fc4642b71829737494258f12996bc1baa (patch)
tree944035dc8d5a213fdd59c8b386d94cbdbf160894 /core
parentb43aefbab6f5b520e6d63367bcdcdd0561f96322 (diff)
downloadframeworks_base-62b83b7fc4642b71829737494258f12996bc1baa.zip
frameworks_base-62b83b7fc4642b71829737494258f12996bc1baa.tar.gz
frameworks_base-62b83b7fc4642b71829737494258f12996bc1baa.tar.bz2
Deprecate extra gd:structuredPostalAddress fields.
For the purposes of contact data, there are some postal address columns that are unsupported, since they don't directly contribute to a "mailing address" for a person. http://code.google.com/apis/contacts/docs/3.0/reference.html#structuredPostalAddressRestrictions http://code.google.com/apis/gdata/docs/2.0/elements.html#gdStructuredPostalAddress
Diffstat (limited to 'core')
-rw-r--r--core/java/android/provider/ContactsContract.java14
1 files changed, 12 insertions, 2 deletions
diff --git a/core/java/android/provider/ContactsContract.java b/core/java/android/provider/ContactsContract.java
index f950c4b..7a1a9e4 100644
--- a/core/java/android/provider/ContactsContract.java
+++ b/core/java/android/provider/ContactsContract.java
@@ -795,7 +795,10 @@ public final class ContactsContract {
/**
* The name that should be used to display the contact.
- * <P>Type: TEXT</P>
+ * <i>Unstructured component of the name should be consistent with
+ * its structured representation.</i>
+ * <p>
+ * Type: TEXT
*/
public static final String DISPLAY_NAME = "data9";
}
@@ -944,7 +947,8 @@ public final class ContactsContract {
public static final int TYPE_OTHER = 3;
/**
- * The full, unstructured postal address.
+ * The full, unstructured postal address. <i>This field must be
+ * consistent with any structured data.</i>
* <p>
* Type: TEXT
*/
@@ -955,7 +959,9 @@ public final class ContactsContract {
* Also for 'in care of' or 'c/o'.
* <p>
* Type: TEXT
+ * @deprecated since this isn't supported by gd:structuredPostalAddress
*/
+ @Deprecated
public static final String AGENT = "data4";
/**
@@ -963,7 +969,9 @@ public final class ContactsContract {
* necessarily numbers), eg. "The Pillars".
* <p>
* Type: TEXT
+ * @deprecated since this isn't supported by gd:structuredPostalAddress
*/
+ @Deprecated
public static final String HOUSENAME = "data5";
/**
@@ -1006,7 +1014,9 @@ public final class ContactsContract {
* intended for delivery addresses.
* <p>
* Type: TEXT
+ * @deprecated since this isn't supported by gd:structuredPostalAddress
*/
+ @Deprecated
public static final String SUBREGION = "data10";
/**