diff options
author | Android (Google) Code Review <android-gerrit@google.com> | 2009-08-12 07:46:53 -0700 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2009-08-12 07:46:53 -0700 |
commit | 4cd1b5a15aedef1d3d6a47b5124f3fe978c114c8 (patch) | |
tree | 2b40eca9a6a1421cd9a7f5b180e7ba0ea69dfde5 /core/java/android | |
parent | 97732c41c3cd26b12682a780ecdbb91d0351db37 (diff) | |
parent | 074fbfe62739c45f5eeb343f0053577221f800ec (diff) | |
download | frameworks_base-4cd1b5a15aedef1d3d6a47b5124f3fe978c114c8.zip frameworks_base-4cd1b5a15aedef1d3d6a47b5124f3fe978c114c8.tar.gz frameworks_base-4cd1b5a15aedef1d3d6a47b5124f3fe978c114c8.tar.bz2 |
Merge change 20787
* changes:
Removing primary/default phone number and email on contact from the API.
Diffstat (limited to 'core/java/android')
-rw-r--r-- | core/java/android/provider/ContactsContract.java | 68 |
1 files changed, 3 insertions, 65 deletions
diff --git a/core/java/android/provider/ContactsContract.java b/core/java/android/provider/ContactsContract.java index 066401f..f950c4b 100644 --- a/core/java/android/provider/ContactsContract.java +++ b/core/java/android/provider/ContactsContract.java @@ -177,36 +177,6 @@ public final class ContactsContract { public static final String DISPLAY_NAME = "display_name"; /** - * Reference to the row in the data table holding the primary phone number. - * <P>Type: INTEGER REFERENCES data(_id)</P> - */ - @Deprecated - public static final String PRIMARY_PHONE_ID = "primary_phone_id"; - - /** - * Reference to the row in the data table holding the default phone number. - * If the contact has only one phone number, that number is the default one. - * Otherwise it is the one explicitly selected by the user as primary. - * <P>Type: INTEGER REFERENCES data(_id)</P> - */ - public static final String DEFAULT_PHONE_ID = "default_phone_id"; - - /** - * Reference to the row in the data table holding the primary email address. - * <P>Type: INTEGER REFERENCES data(_id)</P> - */ - @Deprecated - public static final String PRIMARY_EMAIL_ID = "primary_email_id"; - - /** - * Reference to the row in the data table holding the default email address. - * If the contact has only one email address, that address is the default one. - * Otherwise it is the one explicitly selected by the user as primary. - * <P>Type: INTEGER REFERENCES data(_id)</P> - */ - public static final String DEFAULT_EMAIL_ID = "default_email_id"; - - /** * Reference to the row in the data table holding the photo. * <P>Type: INTEGER REFERENCES data(_id)</P> */ @@ -225,43 +195,11 @@ public final class ContactsContract { public static final String PRESENCE_STATUS = Presence.PRESENCE_STATUS; /** - * The type of data, for example Home or Work. + * An indicator of whether this contact has at least one phone number. "1" if there is + * at least one phone number, "0" otherwise. * <P>Type: INTEGER</P> */ - @Deprecated - public static final String PRIMARY_PHONE_TYPE = CommonDataKinds.Phone.TYPE; - - /** - * The type of data, for example Home or Work. - * <P>Type: INTEGER</P> - */ - public static final String DEFAULT_PHONE_TYPE = "default_phone_type"; - - /** - * The user defined label for the primary phone. - * <P>Type: TEXT</P> - */ - @Deprecated - public static final String PRIMARY_PHONE_LABEL = CommonDataKinds.Phone.LABEL; - - /** - * The user defined label for the default phone. - * <P>Type: TEXT</P> - */ - public static final String DEFAULT_PHONE_LABEL = "default_phone_label"; - - /** - * The primary phone number. - * <P>Type: TEXT</P> - */ - @Deprecated - public static final String PRIMARY_PHONE_NUMBER = CommonDataKinds.Phone.NUMBER; - - /** - * The default phone number. - * <P>Type: TEXT</P> - */ - public static final String DEFAULT_PHONE_NUMBER = "default_phone_number"; + public static final String HAS_PHONE_NUMBER = "has_phone_number"; } /** |