diff --git a/api/current.xml b/api/current.xml
index c8fbb529f72d5..b5352d111debd 100644
--- a/api/current.xml
+++ b/api/current.xml
@@ -112833,6 +112833,3015 @@
>
+
Type: TEXT
+ * @deprecated see {@link android.provider.ContactsContract} */ @Deprecated public static final String _SYNC_ACCOUNT_TYPE = "_sync_account_type"; @@ -94,6 +120,7 @@ public class Contacts { /** * The key of this setting. *Type: TEXT
+ * @deprecated see {@link android.provider.ContactsContract} */ @Deprecated public static final String KEY = "key"; @@ -101,6 +128,7 @@ public class Contacts { /** * The value of this setting. *Type: TEXT
+ * @deprecated see {@link android.provider.ContactsContract} */ @Deprecated public static final String VALUE = "value"; @@ -108,6 +136,7 @@ public class Contacts { /** * The settings over all of the people + * @deprecated see {@link android.provider.ContactsContract} */ @Deprecated public static final class Settings implements BaseColumns, SettingsColumns { @@ -118,6 +147,7 @@ public class Contacts { /** * The content:// style URL for this table + * @deprecated see {@link android.provider.ContactsContract} */ @Deprecated public static final Uri CONTENT_URI = @@ -125,12 +155,14 @@ public class Contacts { /** * The directory twig for this sub-table + * @deprecated see {@link android.provider.ContactsContract} */ @Deprecated public static final String CONTENT_DIRECTORY = "settings"; /** * The default sort order for this table + * @deprecated see {@link android.provider.ContactsContract} */ @Deprecated public static final String DEFAULT_SORT_ORDER = "key ASC"; @@ -143,10 +175,14 @@ public class Contacts { ** This is a boolean setting. It is true if it is set and it is anything other than the * emptry string or "0". + * @deprecated see {@link android.provider.ContactsContract} */ @Deprecated public static final String SYNC_EVERYTHING = "syncEverything"; + /** + * @deprecated see {@link android.provider.ContactsContract} + */ @Deprecated public static String getSetting(ContentResolver cr, String account, String key) { // For now we only support a single account and the UI doesn't know what @@ -177,6 +213,9 @@ public class Contacts { } } + /** + * @deprecated see {@link android.provider.ContactsContract} + */ @Deprecated public static void setSetting(ContentResolver cr, String account, String key, String value) { @@ -195,12 +234,14 @@ public class Contacts { /** * Columns from the People table that other tables join into themselves. + * @deprecated see {@link android.provider.ContactsContract} */ @Deprecated public interface PeopleColumns { /** * The person's name. *
Type: TEXT
+ * @deprecated see {@link android.provider.ContactsContract} */ @Deprecated public static final String NAME = "name"; @@ -210,6 +251,7 @@ public class Contacts { * character set (e.g. hiragana for Japanese). * Used for pronunciation and/or collation in some languages. *Type: TEXT
+ * @deprecated see {@link android.provider.ContactsContract} */ @Deprecated public static final String PHONETIC_NAME = "phonetic_name"; @@ -218,6 +260,7 @@ public class Contacts { * The display name. If name is not null name, else if number is not null number, * else if email is not null email. *Type: TEXT
+ * @deprecated see {@link android.provider.ContactsContract} */ @Deprecated public static final String DISPLAY_NAME = "display_name"; @@ -227,6 +270,7 @@ public class Contacts { * may not be human readable but phonetically sortable. *Type: TEXT
* @hide Used only in Contacts application for now. + * @deprecated see {@link android.provider.ContactsContract} */ @Deprecated public static final String SORT_STRING = "sort_string"; @@ -234,6 +278,7 @@ public class Contacts { /** * Notes about the person. *Type: TEXT
+ * @deprecated see {@link android.provider.ContactsContract} */ @Deprecated public static final String NOTES = "notes"; @@ -241,6 +286,7 @@ public class Contacts { /** * The number of times a person has been contacted *Type: INTEGER
+ * @deprecated see {@link android.provider.ContactsContract} */ @Deprecated public static final String TIMES_CONTACTED = "times_contacted"; @@ -248,6 +294,7 @@ public class Contacts { /** * The last time a person was contacted. *Type: INTEGER
+ * @deprecated see {@link android.provider.ContactsContract} */ @Deprecated public static final String LAST_TIME_CONTACTED = "last_time_contacted"; @@ -255,6 +302,7 @@ public class Contacts { /** * A custom ringtone associated with a person. Not always present. *Type: TEXT (URI to the ringtone)
+ * @deprecated see {@link android.provider.ContactsContract} */ @Deprecated public static final String CUSTOM_RINGTONE = "custom_ringtone"; @@ -263,6 +311,7 @@ public class Contacts { * Whether the person should always be sent to voicemail. Not always * present. *Type: INTEGER (0 for false, 1 for true)
+ * @deprecated see {@link android.provider.ContactsContract} */ @Deprecated public static final String SEND_TO_VOICEMAIL = "send_to_voicemail"; @@ -270,6 +319,7 @@ public class Contacts { /** * Is the contact starred? *Type: INTEGER (boolean)
+ * @deprecated see {@link android.provider.ContactsContract} */ @Deprecated public static final String STARRED = "starred"; @@ -277,6 +327,7 @@ public class Contacts { /** * The server version of the photo *Type: TEXT (the version number portion of the photo URI)
+ * @deprecated see {@link android.provider.ContactsContract} */ @Deprecated public static final String PHOTO_VERSION = "photo_version"; @@ -284,17 +335,20 @@ public class Contacts { /** * This table contains people. + * @deprecated see {@link android.provider.ContactsContract} */ @Deprecated public static final class People implements BaseColumns, SyncConstValue, PeopleColumns, PhonesColumns, PresenceColumns { /** * no public constructor since this is a utility class + * @deprecated see {@link android.provider.ContactsContract} */ private People() {} /** * The content:// style URL for this table + * @deprecated see {@link android.provider.ContactsContract} */ @Deprecated public static final Uri CONTENT_URI = @@ -303,6 +357,7 @@ public class Contacts { /** * The content:// style URL for filtering people by name. The filter * argument should be passed as an additional path segment after this URI. + * @deprecated see {@link android.provider.ContactsContract} */ @Deprecated public static final Uri CONTENT_FILTER_URI = @@ -311,6 +366,7 @@ public class Contacts { /** * The content:// style URL for the table that holds the deleted * contacts. + * @deprecated see {@link android.provider.ContactsContract} */ @Deprecated public static final Uri DELETED_CONTENT_URI = @@ -326,6 +382,7 @@ public class Contacts { * Not exposed because we expect significant changes in the contacts * schema and do not want to have to support this. * @hide + * @deprecated see {@link android.provider.ContactsContract} */ @Deprecated public static final Uri WITH_EMAIL_OR_IM_FILTER_URI = @@ -334,6 +391,7 @@ public class Contacts { /** * The MIME type of {@link #CONTENT_URI} providing a directory of * people. + * @deprecated see {@link android.provider.ContactsContract} */ @Deprecated public static final String CONTENT_TYPE = "vnd.android.cursor.dir/person"; @@ -341,12 +399,14 @@ public class Contacts { /** * The MIME type of a {@link #CONTENT_URI} subdirectory of a single * person. + * @deprecated see {@link android.provider.ContactsContract} */ @Deprecated public static final String CONTENT_ITEM_TYPE = "vnd.android.cursor.item/person"; /** * The default sort order for this table + * @deprecated see {@link android.provider.ContactsContract} */ @Deprecated public static final String DEFAULT_SORT_ORDER = People.NAME + " ASC"; @@ -354,6 +414,7 @@ public class Contacts { /** * The ID of the persons preferred phone number. *Type: INTEGER (foreign key to phones table on the _ID field)
+ * @deprecated see {@link android.provider.ContactsContract} */ @Deprecated public static final String PRIMARY_PHONE_ID = "primary_phone"; @@ -362,6 +423,7 @@ public class Contacts { * The ID of the persons preferred email. *Type: INTEGER (foreign key to contact_methods table on the * _ID field)
+ * @deprecated see {@link android.provider.ContactsContract} */ @Deprecated public static final String PRIMARY_EMAIL_ID = "primary_email"; @@ -370,6 +432,7 @@ public class Contacts { * The ID of the persons preferred organization. *Type: INTEGER (foreign key to organizations table on the * _ID field)
+ * @deprecated see {@link android.provider.ContactsContract} */ @Deprecated public static final String PRIMARY_ORGANIZATION_ID = "primary_organization"; @@ -379,6 +442,7 @@ public class Contacts { * * @param resolver the ContentResolver to use * @param personId the person who was contacted + * @deprecated see {@link android.provider.ContactsContract} */ @Deprecated public static void markAsContacted(ContentResolver resolver, long personId) { @@ -393,6 +457,7 @@ public class Contacts { /** * @hide Used in vCard parser code. + * @deprecated see {@link android.provider.ContactsContract} */ @Deprecated public static long tryGetMyContactsGroupId(ContentResolver resolver) { @@ -417,6 +482,7 @@ public class Contacts { * @param personId the person to add to the group * @return the URI of the group membership row * @throws IllegalStateException if the My Contacts group can't be found + * @deprecated see {@link android.provider.ContactsContract} */ @Deprecated public static Uri addToMyContactsGroup(ContentResolver resolver, long personId) { @@ -436,6 +502,7 @@ public class Contacts { * @param groupName the name of the group to add the contact to * @return the URI of the group membership row * @throws IllegalStateException if the group can't be found + * @deprecated see {@link android.provider.ContactsContract} */ @Deprecated public static Uri addToGroup(ContentResolver resolver, long personId, String groupName) { @@ -466,6 +533,7 @@ public class Contacts { * @param personId the person to add to the group * @param groupId the group to add the person to * @return the URI of the group membership row + * @deprecated see {@link android.provider.ContactsContract} */ @Deprecated public static Uri addToGroup(ContentResolver resolver, long personId, long groupId) { @@ -485,6 +553,7 @@ public class Contacts { * @param resolver the ContentResolver to use * @param values the values to use when creating the contact * @return the URI of the contact, or null if the operation fails + * @deprecated see {@link android.provider.ContactsContract} */ @Deprecated public static Uri createPersonInMyContactsGroup(ContentResolver resolver, @@ -503,6 +572,9 @@ public class Contacts { return contactUri; } + /** + * @deprecated see {@link android.provider.ContactsContract} + */ @Deprecated public static Cursor queryGroups(ContentResolver resolver, long person) { return resolver.query(GroupMembership.CONTENT_URI, null, "person=?", @@ -514,6 +586,7 @@ public class Contacts { * @param cr the ContentResolver to use * @param person the Uri of the person whose photo is to be updated * @param data the byte[] that represents the photo + * @deprecated see {@link android.provider.ContactsContract} */ @Deprecated public static void setPhotoData(ContentResolver cr, Uri person, byte[] data) { @@ -527,6 +600,7 @@ public class Contacts { * Opens an InputStream for the person's photo and returns the photo as a Bitmap. * If the person's photo isn't present returns the placeholderImageResource instead. * @param person the person whose photo should be used + * @deprecated see {@link android.provider.ContactsContract} */ @Deprecated public static InputStream openContactPhotoInputStream(ContentResolver cr, Uri person) { @@ -554,6 +628,7 @@ public class Contacts { * @param placeholderImageResource the image resource to use if the person doesn't * have a photo * @param options the decoding options, can be set to null + * @deprecated see {@link android.provider.ContactsContract} */ @Deprecated public static Bitmap loadContactPhoto(Context context, Uri person, @@ -581,6 +656,7 @@ public class Contacts { /** * A sub directory of a single person that contains all of their Phones. + * @deprecated see {@link android.provider.ContactsContract} */ @Deprecated public static final class Phones implements BaseColumns, PhonesColumns, @@ -606,6 +682,7 @@ public class Contacts { /** * A subdirectory of a single person that contains all of their * ContactMethods. + * @deprecated see {@link android.provider.ContactsContract} */ @Deprecated public static final class ContactMethods @@ -617,12 +694,14 @@ public class Contacts { /** * The directory twig for this sub-table + * @deprecated see {@link android.provider.ContactsContract} */ @Deprecated public static final String CONTENT_DIRECTORY = "contact_methods"; /** * The default sort order for this table + * @deprecated see {@link android.provider.ContactsContract} */ @Deprecated public static final String DEFAULT_SORT_ORDER = "data ASC"; @@ -630,22 +709,26 @@ public class Contacts { /** * The extensions for a person + * @deprecated see {@link android.provider.ContactsContract} */ @Deprecated public static class Extensions implements BaseColumns, ExtensionsColumns { /** * no public constructor since this is a utility class + * @deprecated see {@link android.provider.ContactsContract} */ private Extensions() {} /** * The directory twig for this sub-table + * @deprecated see {@link android.provider.ContactsContract} */ @Deprecated public static final String CONTENT_DIRECTORY = "extensions"; /** * The default sort order for this table + * @deprecated see {@link android.provider.ContactsContract} */ @Deprecated public static final String DEFAULT_SORT_ORDER = "name ASC"; @@ -653,6 +736,7 @@ public class Contacts { /** * The ID of the person this phone number is assigned to. *Type: INTEGER (long)
+ * @deprecated see {@link android.provider.ContactsContract} */ @Deprecated public static final String PERSON_ID = "person"; @@ -661,12 +745,14 @@ public class Contacts { /** * Columns from the groups table. + * @deprecated see {@link android.provider.ContactsContract} */ @Deprecated public interface GroupsColumns { /** * The group name. *Type: TEXT
+ * @deprecated see {@link android.provider.ContactsContract} */ @Deprecated public static final String NAME = "name"; @@ -674,6 +760,7 @@ public class Contacts { /** * Notes about the group. *Type: TEXT
+ * @deprecated see {@link android.provider.ContactsContract} */ @Deprecated public static final String NOTES = "notes"; @@ -682,6 +769,7 @@ public class Contacts { * Whether this group should be synced if the SYNC_EVERYTHING settings is false * for this group's account. *Type: INTEGER (boolean)
+ * @deprecated see {@link android.provider.ContactsContract} */ @Deprecated public static final String SHOULD_SYNC = "should_sync"; @@ -689,6 +777,7 @@ public class Contacts { /** * The ID of this group if it is a System Group, null otherwise. *Type: TEXT
+ * @deprecated see {@link android.provider.ContactsContract} */ @Deprecated public static final String SYSTEM_ID = "system_id"; @@ -696,6 +785,7 @@ public class Contacts { /** * This table contains the groups for an account. + * @deprecated see {@link android.provider.ContactsContract} */ @Deprecated public static final class Groups @@ -707,6 +797,7 @@ public class Contacts { /** * The content:// style URL for this table + * @deprecated see {@link android.provider.ContactsContract} */ @Deprecated public static final Uri CONTENT_URI = @@ -715,6 +806,7 @@ public class Contacts { /** * The content:// style URL for the table that holds the deleted * groups. + * @deprecated see {@link android.provider.ContactsContract} */ @Deprecated public static final Uri DELETED_CONTENT_URI = @@ -723,6 +815,7 @@ public class Contacts { /** * The MIME type of {@link #CONTENT_URI} providing a directory of * groups. + * @deprecated see {@link android.provider.ContactsContract} */ @Deprecated public static final String CONTENT_TYPE = "vnd.android.cursor.dir/contactsgroup"; @@ -730,24 +823,27 @@ public class Contacts { /** * The MIME type of a {@link #CONTENT_URI} subdirectory of a single * group. + * @deprecated see {@link android.provider.ContactsContract} */ @Deprecated public static final String CONTENT_ITEM_TYPE = "vnd.android.cursor.item/contactsgroup"; /** * The default sort order for this table + * @deprecated see {@link android.provider.ContactsContract} */ @Deprecated public static final String DEFAULT_SORT_ORDER = NAME + " ASC"; /** - * + * @deprecated see {@link android.provider.ContactsContract} */ @Deprecated public static final String GROUP_ANDROID_STARRED = "Starred in Android"; /** * The "My Contacts" system group. + * @deprecated see {@link android.provider.ContactsContract} */ @Deprecated public static final String GROUP_MY_CONTACTS = "Contacts"; @@ -755,36 +851,63 @@ public class Contacts { /** * Columns from the Phones table that other columns join into themselves. + * @deprecated see {@link android.provider.ContactsContract} */ @Deprecated public interface PhonesColumns { /** * The type of the the phone number. *Type: INTEGER (one of the constants below)
+ * @deprecated see {@link android.provider.ContactsContract} */ @Deprecated public static final String TYPE = "type"; + /** + * @deprecated see {@link android.provider.ContactsContract} + */ @Deprecated public static final int TYPE_CUSTOM = 0; + /** + * @deprecated see {@link android.provider.ContactsContract} + */ @Deprecated public static final int TYPE_HOME = 1; + /** + * @deprecated see {@link android.provider.ContactsContract} + */ @Deprecated public static final int TYPE_MOBILE = 2; + /** + * @deprecated see {@link android.provider.ContactsContract} + */ @Deprecated public static final int TYPE_WORK = 3; + /** + * @deprecated see {@link android.provider.ContactsContract} + */ @Deprecated public static final int TYPE_FAX_WORK = 4; + /** + * @deprecated see {@link android.provider.ContactsContract} + */ @Deprecated public static final int TYPE_FAX_HOME = 5; + /** + * @deprecated see {@link android.provider.ContactsContract} + */ @Deprecated public static final int TYPE_PAGER = 6; + /** + * @deprecated see {@link android.provider.ContactsContract} + */ @Deprecated public static final int TYPE_OTHER = 7; /** * The user provided label for the phone number, only used if TYPE is TYPE_CUSTOM. *Type: TEXT
+ * @deprecated see {@link android.provider.ContactsContract} */ @Deprecated public static final String LABEL = "label"; @@ -792,6 +915,7 @@ public class Contacts { /** * The phone number as the user entered it. *Type: TEXT
+ * @deprecated see {@link android.provider.ContactsContract} */ @Deprecated public static final String NUMBER = "number"; @@ -799,6 +923,7 @@ public class Contacts { /** * The normalized phone number *Type: TEXT
+ * @deprecated see {@link android.provider.ContactsContract} */ @Deprecated public static final String NUMBER_KEY = "number_key"; @@ -806,6 +931,7 @@ public class Contacts { /** * Whether this is the primary phone number *Type: INTEGER (if set, non-0 means true)
+ * @deprecated see {@link android.provider.ContactsContract} */ @Deprecated public static final String ISPRIMARY = "isprimary"; @@ -815,6 +941,7 @@ public class Contacts { * This table stores phone numbers and a reference to the person that the * contact method belongs to. Phone numbers are stored separately from * other contact methods to make caller ID lookup more efficient. + * @deprecated see {@link android.provider.ContactsContract} */ @Deprecated public static final class Phones @@ -824,6 +951,9 @@ public class Contacts { */ private Phones() {} + /** + * @deprecated see {@link android.provider.ContactsContract} + */ @Deprecated public static final CharSequence getDisplayLabel(Context context, int type, CharSequence label, CharSequence[] labelArray) { @@ -846,6 +976,9 @@ public class Contacts { return display; } + /** + * @deprecated see {@link android.provider.ContactsContract} + */ @Deprecated public static final CharSequence getDisplayLabel(Context context, int type, CharSequence label) { @@ -854,6 +987,7 @@ public class Contacts { /** * The content:// style URL for this table + * @deprecated see {@link android.provider.ContactsContract} */ @Deprecated public static final Uri CONTENT_URI = @@ -861,6 +995,7 @@ public class Contacts { /** * The content:// style URL for filtering phone numbers + * @deprecated see {@link android.provider.ContactsContract} */ @Deprecated public static final Uri CONTENT_FILTER_URL = @@ -869,6 +1004,7 @@ public class Contacts { /** * The MIME type of {@link #CONTENT_URI} providing a directory of * phones. + * @deprecated see {@link android.provider.ContactsContract} */ @Deprecated public static final String CONTENT_TYPE = "vnd.android.cursor.dir/phone"; @@ -876,12 +1012,14 @@ public class Contacts { /** * The MIME type of a {@link #CONTENT_URI} subdirectory of a single * phone. + * @deprecated see {@link android.provider.ContactsContract} */ @Deprecated public static final String CONTENT_ITEM_TYPE = "vnd.android.cursor.item/phone"; /** * The default sort order for this table + * @deprecated see {@link android.provider.ContactsContract} */ @Deprecated public static final String DEFAULT_SORT_ORDER = "name ASC"; @@ -889,11 +1027,15 @@ public class Contacts { /** * The ID of the person this phone number is assigned to. *Type: INTEGER (long)
+ * @deprecated see {@link android.provider.ContactsContract} */ @Deprecated public static final String PERSON_ID = "person"; } + /** + * @deprecated see {@link android.provider.ContactsContract} + */ @Deprecated public static final class GroupMembership implements BaseColumns, GroupsColumns { /** @@ -903,6 +1045,7 @@ public class Contacts { /** * The content:// style URL for this table + * @deprecated see {@link android.provider.ContactsContract} */ @Deprecated public static final Uri CONTENT_URI = @@ -910,6 +1053,7 @@ public class Contacts { /** * The content:// style URL for this table + * @deprecated see {@link android.provider.ContactsContract} */ @Deprecated public static final Uri RAW_CONTENT_URI = @@ -917,6 +1061,7 @@ public class Contacts { /** * The directory twig for this sub-table + * @deprecated see {@link android.provider.ContactsContract} */ @Deprecated public static final String CONTENT_DIRECTORY = "groupmembership"; @@ -924,6 +1069,7 @@ public class Contacts { /** * The MIME type of {@link #CONTENT_URI} providing a directory of all * person groups. + * @deprecated see {@link android.provider.ContactsContract} */ @Deprecated public static final String CONTENT_TYPE = "vnd.android.cursor.dir/contactsgroupmembership"; @@ -931,6 +1077,7 @@ public class Contacts { /** * The MIME type of a {@link #CONTENT_URI} subdirectory of a single * person group. + * @deprecated see {@link android.provider.ContactsContract} */ @Deprecated public static final String CONTENT_ITEM_TYPE = @@ -938,6 +1085,7 @@ public class Contacts { /** * The default sort order for this table + * @deprecated see {@link android.provider.ContactsContract} */ @Deprecated public static final String DEFAULT_SORT_ORDER = "group_id ASC"; @@ -945,6 +1093,7 @@ public class Contacts { /** * The row id of the accounts group. *Type: TEXT
+ * @deprecated see {@link android.provider.ContactsContract} */ @Deprecated public static final String GROUP_ID = "group_id"; @@ -952,6 +1101,7 @@ public class Contacts { /** * The sync id of the group. *Type: TEXT
+ * @deprecated see {@link android.provider.ContactsContract} */ @Deprecated public static final String GROUP_SYNC_ID = "group_sync_id"; @@ -959,6 +1109,7 @@ public class Contacts { /** * The account of the group. *Type: TEXT
+ * @deprecated see {@link android.provider.ContactsContract} */ @Deprecated public static final String GROUP_SYNC_ACCOUNT = "group_sync_account"; @@ -966,6 +1117,7 @@ public class Contacts { /** * The account type of the group. *Type: TEXT
+ * @deprecated see {@link android.provider.ContactsContract} */ @Deprecated public static final String GROUP_SYNC_ACCOUNT_TYPE = "group_sync_account_type"; @@ -973,6 +1125,7 @@ public class Contacts { /** * The row id of the person. *Type: TEXT
+ * @deprecated see {@link android.provider.ContactsContract} */ @Deprecated public static final String PERSON_ID = "person"; @@ -981,6 +1134,7 @@ public class Contacts { /** * Columns from the ContactMethods table that other tables join into * themseleves. + * @deprecated see {@link android.provider.ContactsContract} */ @Deprecated public interface ContactMethodsColumns { @@ -988,6 +1142,7 @@ public class Contacts { * The kind of the the contact method. For example, email address, * postal address, etc. *Type: INTEGER (one of the values below)
+ * @deprecated see {@link android.provider.ContactsContract} */ @Deprecated public static final String KIND = "kind"; @@ -995,20 +1150,34 @@ public class Contacts { /** * The type of the contact method, must be one of the types below. *Type: INTEGER (one of the values below)
+ * @deprecated see {@link android.provider.ContactsContract} */ @Deprecated public static final String TYPE = "type"; + /** + * @deprecated see {@link android.provider.ContactsContract} + */ @Deprecated public static final int TYPE_CUSTOM = 0; + /** + * @deprecated see {@link android.provider.ContactsContract} + */ @Deprecated public static final int TYPE_HOME = 1; + /** + * @deprecated see {@link android.provider.ContactsContract} + */ @Deprecated public static final int TYPE_WORK = 2; + /** + * @deprecated see {@link android.provider.ContactsContract} + */ @Deprecated public static final int TYPE_OTHER = 3; /** * @hide This is temporal. TYPE_MOBILE should be added to TYPE in the future. + * @deprecated see {@link android.provider.ContactsContract} */ @Deprecated public static final int MOBILE_EMAIL_TYPE_INDEX = 2; @@ -1016,6 +1185,7 @@ public class Contacts { /** * @hide This is temporal. TYPE_MOBILE should be added to TYPE in the future. * This is not "mobile" but "CELL" since vCard uses it for identifying mobile phone. + * @deprecated see {@link android.provider.ContactsContract} */ @Deprecated public static final String MOBILE_EMAIL_TYPE_NAME = "_AUTO_CELL"; @@ -1023,6 +1193,7 @@ public class Contacts { /** * The user defined label for the the contact method. *Type: TEXT
+ * @deprecated see {@link android.provider.ContactsContract} */ @Deprecated public static final String LABEL = "label"; @@ -1030,6 +1201,7 @@ public class Contacts { /** * The data for the contact method. *Type: TEXT
+ * @deprecated see {@link android.provider.ContactsContract} */ @Deprecated public static final String DATA = "data"; @@ -1037,6 +1209,7 @@ public class Contacts { /** * Auxiliary data for the contact method. *Type: TEXT
+ * @deprecated see {@link android.provider.ContactsContract} */ @Deprecated public static final String AUX_DATA = "aux_data"; @@ -1044,6 +1217,7 @@ public class Contacts { /** * Whether this is the primary organization *Type: INTEGER (if set, non-0 means true)
+ * @deprecated see {@link android.provider.ContactsContract} */ @Deprecated public static final String ISPRIMARY = "isprimary"; @@ -1052,6 +1226,7 @@ public class Contacts { /** * This table stores all non-phone contact methods and a reference to the * person that the contact method belongs to. + * @deprecated see {@link android.provider.ContactsContract} */ @Deprecated public static final class ContactMethods @@ -1059,6 +1234,7 @@ public class Contacts { /** * The column with latitude data for postal locations *Type: REAL
+ * @deprecated see {@link android.provider.ContactsContract} */ @Deprecated public static final String POSTAL_LOCATION_LATITUDE = DATA; @@ -1066,6 +1242,7 @@ public class Contacts { /** * The column with longitude data for postal locations *Type: REAL
+ * @deprecated see {@link android.provider.ContactsContract} */ @Deprecated public static final String POSTAL_LOCATION_LONGITUDE = AUX_DATA; @@ -1077,34 +1254,65 @@ public class Contacts { * - null * - pre:Type: INTEGER (long)
+ * @deprecated see {@link android.provider.ContactsContract} */ @Deprecated public static final String PERSON_ID = "person"; @@ -1304,6 +1527,7 @@ public class Contacts { /** * The IM presence columns with some contacts specific columns mixed in. + * @deprecated see {@link android.provider.ContactsContract} */ @Deprecated public interface PresenceColumns extends Im.CommonPresenceColumns { @@ -1312,6 +1536,7 @@ public class Contacts { * {@link Contacts.ContactMethods#encodePredefinedImProtocol} or * {@link Contacts.ContactMethods#encodeCustomImProtocol}. *Type: STRING
+ * @deprecated see {@link android.provider.ContactsContract} */ @Deprecated public static final String IM_PROTOCOL = "im_protocol"; @@ -1320,6 +1545,7 @@ public class Contacts { * The IM handle the presence item is for. The handle is scoped to * the {@link #IM_PROTOCOL}. *Type: STRING
+ * @deprecated see {@link android.provider.ContactsContract} */ @Deprecated public static final String IM_HANDLE = "im_handle"; @@ -1327,6 +1553,7 @@ public class Contacts { /** * The IM account for the local user that the presence data came from. *Type: STRING
+ * @deprecated see {@link android.provider.ContactsContract} */ @Deprecated public static final String IM_ACCOUNT = "im_account"; @@ -1335,12 +1562,14 @@ public class Contacts { /** * Contains presence information about contacts. * @hide + * @deprecated see {@link android.provider.ContactsContract} */ @Deprecated public static final class Presence implements BaseColumns, PresenceColumns, PeopleColumns { /** * The content:// style URL for this table + * @deprecated see {@link android.provider.ContactsContract} */ @Deprecated public static final Uri CONTENT_URI = @@ -1349,6 +1578,7 @@ public class Contacts { /** * The ID of the person this presence item is assigned to. *Type: INTEGER (long)
+ * @deprecated see {@link android.provider.ContactsContract} */ @Deprecated public static final String PERSON_ID = "person"; @@ -1358,6 +1588,7 @@ public class Contacts { * * @param status the status to get the icon for * @return the resource ID for the proper presence icon + * @deprecated see {@link android.provider.ContactsContract} */ @Deprecated public static final int getPresenceIconResourceId(int status) { @@ -1386,6 +1617,7 @@ public class Contacts { * * @param icon the icon to to set * @param serverStatus that status + * @deprecated see {@link android.provider.ContactsContract} */ @Deprecated public static final void setPresenceIcon(ImageView icon, int serverStatus) { @@ -1395,26 +1627,38 @@ public class Contacts { /** * Columns from the Organizations table that other columns join into themselves. + * @deprecated see {@link android.provider.ContactsContract} */ @Deprecated public interface OrganizationColumns { /** * The type of the organizations. *Type: INTEGER (one of the constants below)
+ * @deprecated see {@link android.provider.ContactsContract} */ @Deprecated public static final String TYPE = "type"; + /** + * @deprecated see {@link android.provider.ContactsContract} + */ @Deprecated public static final int TYPE_CUSTOM = 0; + /** + * @deprecated see {@link android.provider.ContactsContract} + */ @Deprecated public static final int TYPE_WORK = 1; + /** + * @deprecated see {@link android.provider.ContactsContract} + */ @Deprecated public static final int TYPE_OTHER = 2; /** * The user provided label, only used if TYPE is TYPE_CUSTOM. *Type: TEXT
+ * @deprecated see {@link android.provider.ContactsContract} */ @Deprecated public static final String LABEL = "label"; @@ -1422,6 +1666,7 @@ public class Contacts { /** * The name of the company for this organization. *Type: TEXT
+ * @deprecated see {@link android.provider.ContactsContract} */ @Deprecated public static final String COMPANY = "company"; @@ -1429,6 +1674,7 @@ public class Contacts { /** * The title within this organization. *Type: TEXT
+ * @deprecated see {@link android.provider.ContactsContract} */ @Deprecated public static final String TITLE = "title"; @@ -1436,6 +1682,7 @@ public class Contacts { /** * The person this organization is tied to. *Type: TEXT
+ * @deprecated see {@link android.provider.ContactsContract} */ @Deprecated public static final String PERSON_ID = "person"; @@ -1443,6 +1690,7 @@ public class Contacts { /** * Whether this is the primary organization *Type: INTEGER (if set, non-0 means true)
+ * @deprecated see {@link android.provider.ContactsContract} */ @Deprecated public static final String ISPRIMARY = "isprimary"; @@ -1450,6 +1698,7 @@ public class Contacts { /** * A sub directory of a single person that contains all of their Phones. + * @deprecated see {@link android.provider.ContactsContract} */ @Deprecated public static final class Organizations implements BaseColumns, OrganizationColumns { @@ -1458,6 +1707,9 @@ public class Contacts { */ private Organizations() {} + /** + * @deprecated see {@link android.provider.ContactsContract} + */ @Deprecated public static final CharSequence getDisplayLabel(Context context, int type, CharSequence label) { @@ -1481,6 +1733,7 @@ public class Contacts { /** * The content:// style URL for this table + * @deprecated see {@link android.provider.ContactsContract} */ @Deprecated public static final Uri CONTENT_URI = @@ -1488,12 +1741,14 @@ public class Contacts { /** * The directory twig for this sub-table + * @deprecated see {@link android.provider.ContactsContract} */ @Deprecated public static final String CONTENT_DIRECTORY = "organizations"; /** * The default sort order for this table + * @deprecated see {@link android.provider.ContactsContract} */ @Deprecated public static final String DEFAULT_SORT_ORDER = "company, title, isprimary ASC"; @@ -1501,12 +1756,14 @@ public class Contacts { /** * Columns from the Photos table that other columns join into themselves. + * @deprecated see {@link android.provider.ContactsContract} */ @Deprecated public interface PhotosColumns { /** * The _SYNC_VERSION of the photo that was last downloaded *Type: TEXT
+ * @deprecated see {@link android.provider.ContactsContract} */ @Deprecated public static final String LOCAL_VERSION = "local_version"; @@ -1514,6 +1771,7 @@ public class Contacts { /** * The person this photo is associated with. *Type: TEXT
+ * @deprecated see {@link android.provider.ContactsContract} */ @Deprecated public static final String PERSON_ID = "person"; @@ -1522,6 +1780,7 @@ public class Contacts { * non-zero if a download is required and the photo isn't marked as a bad resource. * You must specify this in the columns in order to use it in the where clause. *Type: INTEGER(boolean)
+ * @deprecated see {@link android.provider.ContactsContract} */ @Deprecated public static final String DOWNLOAD_REQUIRED = "download_required"; @@ -1529,6 +1788,7 @@ public class Contacts { /** * non-zero if this photo is known to exist on the server *Type: INTEGER(boolean)
+ * @deprecated see {@link android.provider.ContactsContract} */ @Deprecated public static final String EXISTS_ON_SERVER = "exists_on_server"; @@ -1537,6 +1797,7 @@ public class Contacts { * Contains the description of the upload or download error from * the previous attempt. If null then the previous attempt succeeded. *Type: TEXT
+ * @deprecated see {@link android.provider.ContactsContract} */ @Deprecated public static final String SYNC_ERROR = "sync_error"; @@ -1544,6 +1805,7 @@ public class Contacts { /** * The image data, or null if there is no image. *Type: BLOB
+ * @deprecated see {@link android.provider.ContactsContract} */ @Deprecated public static final String DATA = "data"; @@ -1552,6 +1814,7 @@ public class Contacts { /** * The photos over all of the people + * @deprecated see {@link android.provider.ContactsContract} */ @Deprecated public static final class Photos implements BaseColumns, PhotosColumns, SyncConstValue { @@ -1562,29 +1825,35 @@ public class Contacts { /** * The content:// style URL for this table + * @deprecated see {@link android.provider.ContactsContract} */ @Deprecated - public static final Uri CONTENT_URI = - Uri.parse("content://contacts/photos"); + public static final Uri CONTENT_URI = Uri.parse("content://contacts/photos"); /** * The directory twig for this sub-table + * @deprecated see {@link android.provider.ContactsContract} */ @Deprecated public static final String CONTENT_DIRECTORY = "photo"; /** * The default sort order for this table + * @deprecated see {@link android.provider.ContactsContract} */ @Deprecated public static final String DEFAULT_SORT_ORDER = "person ASC"; } + /** + * @deprecated see {@link android.provider.ContactsContract} + */ @Deprecated public interface ExtensionsColumns { /** * The name of this extension. May not be null. There may be at most one row for each name. *Type: TEXT
+ * @deprecated see {@link android.provider.ContactsContract} */ @Deprecated public static final String NAME = "name"; @@ -1592,6 +1861,7 @@ public class Contacts { /** * The value of this extension. May not be null. *Type: TEXT
+ * @deprecated see {@link android.provider.ContactsContract} */ @Deprecated public static final String VALUE = "value"; @@ -1599,6 +1869,7 @@ public class Contacts { /** * The extensions for a person + * @deprecated see {@link android.provider.ContactsContract} */ @Deprecated public static final class Extensions implements BaseColumns, ExtensionsColumns { @@ -1609,6 +1880,7 @@ public class Contacts { /** * The content:// style URL for this table + * @deprecated see {@link android.provider.ContactsContract} */ @Deprecated public static final Uri CONTENT_URI = @@ -1617,6 +1889,7 @@ public class Contacts { /** * The MIME type of {@link #CONTENT_URI} providing a directory of * phones. + * @deprecated see {@link android.provider.ContactsContract} */ @Deprecated public static final String CONTENT_TYPE = "vnd.android.cursor.dir/contact_extensions"; @@ -1624,12 +1897,14 @@ public class Contacts { /** * The MIME type of a {@link #CONTENT_URI} subdirectory of a single * phone. + * @deprecated see {@link android.provider.ContactsContract} */ @Deprecated public static final String CONTENT_ITEM_TYPE = "vnd.android.cursor.item/contact_extensions"; /** * The default sort order for this table + * @deprecated see {@link android.provider.ContactsContract} */ @Deprecated public static final String DEFAULT_SORT_ORDER = "person, name ASC"; @@ -1637,6 +1912,7 @@ public class Contacts { /** * The ID of the person this phone number is assigned to. *Type: INTEGER (long)
+ * @deprecated see {@link android.provider.ContactsContract} */ @Deprecated public static final String PERSON_ID = "person"; @@ -1645,6 +1921,7 @@ public class Contacts { /** * Contains helper classes used to create or manage {@link android.content.Intent Intents} * that involve contacts. + * @deprecated see {@link android.provider.ContactsContract} */ @Deprecated public static final class Intents { @@ -1654,6 +1931,7 @@ public class Contacts { /** * This is the intent that is fired when a search suggestion is clicked on. + * @deprecated see {@link android.provider.ContactsContract} */ @Deprecated public static final String SEARCH_SUGGESTION_CLICKED = @@ -1662,6 +1940,7 @@ public class Contacts { /** * This is the intent that is fired when a search suggestion for dialing a number * is clicked on. + * @deprecated see {@link android.provider.ContactsContract} */ @Deprecated public static final String SEARCH_SUGGESTION_DIAL_NUMBER_CLICKED = @@ -1670,6 +1949,7 @@ public class Contacts { /** * This is the intent that is fired when a search suggestion for creating a contact * is clicked on. + * @deprecated see {@link android.provider.ContactsContract} */ @Deprecated public static final String SEARCH_SUGGESTION_CREATE_CONTACT_CLICKED = @@ -1678,6 +1958,7 @@ public class Contacts { /** * Starts an Activity that lets the user pick a contact to attach an image to. * After picking the contact it launches the image cropper in face detection mode. + * @deprecated see {@link android.provider.ContactsContract} */ @Deprecated public static final String ATTACH_IMAGE = ContactsContract.Intents.ATTACH_IMAGE; @@ -1704,6 +1985,7 @@ public class Contacts { ** Passing true for the {@link #EXTRA_FORCE_CREATE} extra will skip * prompting the user when the contact doesn't exist. + * @deprecated see {@link android.provider.ContactsContract} */ @Deprecated public static final String SHOW_OR_CREATE_CONTACT = @@ -1715,6 +1997,7 @@ public class Contacts { * to prompt user with dialog before creating. *
* Type: BOOLEAN + * @deprecated see {@link android.provider.ContactsContract} */ @Deprecated public static final String EXTRA_FORCE_CREATE = ContactsContract.Intents.EXTRA_FORCE_CREATE; @@ -1725,6 +2008,7 @@ public class Contacts { * contact. *
* Type: STRING + * @deprecated see {@link android.provider.ContactsContract} */ @Deprecated public static final String EXTRA_CREATE_DESCRIPTION = @@ -1736,27 +2020,34 @@ public class Contacts { * dialog will be centered. * * @hide pending API council review + * @deprecated see {@link android.provider.ContactsContract} */ @Deprecated public static final String EXTRA_TARGET_RECT = ContactsContract.Intents.EXTRA_TARGET_RECT; /** * Intents related to the Contacts app UI. + * @deprecated see {@link android.provider.ContactsContract} */ @Deprecated public static final class UI { + /** + * @deprecated see {@link android.provider.ContactsContract} + */ @Deprecated public UI() { } /** * The action for the default contacts list tab. + * @deprecated see {@link android.provider.ContactsContract} */ @Deprecated public static final String LIST_DEFAULT = ContactsContract.Intents.UI.LIST_DEFAULT; /** * The action for the contacts list tab. + * @deprecated see {@link android.provider.ContactsContract} */ @Deprecated public static final String LIST_GROUP_ACTION = @@ -1764,12 +2055,14 @@ public class Contacts { /** * When in LIST_GROUP_ACTION mode, this is the group to display. + * @deprecated see {@link android.provider.ContactsContract} */ @Deprecated public static final String GROUP_NAME_EXTRA_KEY = ContactsContract.Intents.UI.GROUP_NAME_EXTRA_KEY; /** * The action for the all contacts list tab. + * @deprecated see {@link android.provider.ContactsContract} */ @Deprecated public static final String LIST_ALL_CONTACTS_ACTION = @@ -1777,6 +2070,7 @@ public class Contacts { /** * The action for the contacts with phone numbers list tab. + * @deprecated see {@link android.provider.ContactsContract} */ @Deprecated public static final String LIST_CONTACTS_WITH_PHONES_ACTION = @@ -1784,6 +2078,7 @@ public class Contacts { /** * The action for the starred contacts list tab. + * @deprecated see {@link android.provider.ContactsContract} */ @Deprecated public static final String LIST_STARRED_ACTION = @@ -1791,6 +2086,7 @@ public class Contacts { /** * The action for the frequent contacts list tab. + * @deprecated see {@link android.provider.ContactsContract} */ @Deprecated public static final String LIST_FREQUENT_ACTION = @@ -1800,6 +2096,7 @@ public class Contacts { * The action for the "strequent" contacts list tab. It first lists the starred * contacts in alphabetical order and then the frequent contacts in descending * order of the number of times they have been contacted. + * @deprecated see {@link android.provider.ContactsContract} */ @Deprecated public static final String LIST_STREQUENT_ACTION = @@ -1808,6 +2105,7 @@ public class Contacts { /** * A key for to be used as an intent extra to set the activity * title to a custom String value. + * @deprecated see {@link android.provider.ContactsContract} */ @Deprecated public static final String TITLE_EXTRA_KEY = @@ -1820,6 +2118,7 @@ public class Contacts { * filtering *
* Output: Nothing. + * @deprecated see {@link android.provider.ContactsContract} */ @Deprecated public static final String FILTER_CONTACTS_ACTION = @@ -1828,6 +2127,7 @@ public class Contacts { /** * Used as an int extra field in {@link #FILTER_CONTACTS_ACTION} * intents to supply the text on which to filter. + * @deprecated see {@link android.provider.ContactsContract} */ @Deprecated public static final String FILTER_TEXT_EXTRA_KEY = @@ -1837,19 +2137,26 @@ public class Contacts { /** * Convenience class that contains string constants used * to create contact {@link android.content.Intent Intents}. + * @deprecated see {@link android.provider.ContactsContract} */ @Deprecated public static final class Insert { + /** + * @deprecated see {@link android.provider.ContactsContract} + */ @Deprecated public Insert() { } - /** The action code to use when adding a contact */ + /** The action code to use when adding a contact + * @deprecated see {@link android.provider.ContactsContract} + */ @Deprecated public static final String ACTION = ContactsContract.Intents.Insert.ACTION; /** * If present, forces a bypass of quick insert mode. + * @deprecated see {@link android.provider.ContactsContract} */ @Deprecated public static final String FULL_MODE = ContactsContract.Intents.Insert.FULL_MODE; @@ -1857,6 +2164,7 @@ public class Contacts { /** * The extra field for the contact name. *
Type: String
+ * @deprecated see {@link android.provider.ContactsContract} */ @Deprecated public static final String NAME = ContactsContract.Intents.Insert.NAME; @@ -1864,6 +2172,7 @@ public class Contacts { /** * The extra field for the contact phonetic name. *Type: String
+ * @deprecated see {@link android.provider.ContactsContract} */ @Deprecated public static final String PHONETIC_NAME = @@ -1872,6 +2181,7 @@ public class Contacts { /** * The extra field for the contact company. *Type: String
+ * @deprecated see {@link android.provider.ContactsContract} */ @Deprecated public static final String COMPANY = ContactsContract.Intents.Insert.COMPANY; @@ -1879,6 +2189,7 @@ public class Contacts { /** * The extra field for the contact job title. *Type: String
+ * @deprecated see {@link android.provider.ContactsContract} */ @Deprecated public static final String JOB_TITLE = ContactsContract.Intents.Insert.JOB_TITLE; @@ -1886,6 +2197,7 @@ public class Contacts { /** * The extra field for the contact notes. *Type: String
+ * @deprecated see {@link android.provider.ContactsContract} */ @Deprecated public static final String NOTES = ContactsContract.Intents.Insert.NOTES; @@ -1893,6 +2205,7 @@ public class Contacts { /** * The extra field for the contact phone number. *Type: String
+ * @deprecated see {@link android.provider.ContactsContract} */ @Deprecated public static final String PHONE = ContactsContract.Intents.Insert.PHONE; @@ -1901,6 +2214,7 @@ public class Contacts { * The extra field for the contact phone number type. *Type: Either an integer value from {@link android.provider.Contacts.PhonesColumns PhonesColumns}, * or a string specifying a custom label.
+ * @deprecated see {@link android.provider.ContactsContract} */ @Deprecated public static final String PHONE_TYPE = ContactsContract.Intents.Insert.PHONE_TYPE; @@ -1908,6 +2222,7 @@ public class Contacts { /** * The extra field for the phone isprimary flag. *Type: boolean
+ * @deprecated see {@link android.provider.ContactsContract} */ @Deprecated public static final String PHONE_ISPRIMARY = @@ -1916,6 +2231,7 @@ public class Contacts { /** * The extra field for an optional second contact phone number. *Type: String
+ * @deprecated see {@link android.provider.ContactsContract} */ @Deprecated public static final String SECONDARY_PHONE = @@ -1925,6 +2241,7 @@ public class Contacts { * The extra field for an optional second contact phone number type. *Type: Either an integer value from {@link android.provider.Contacts.PhonesColumns PhonesColumns}, * or a string specifying a custom label.
+ * @deprecated see {@link android.provider.ContactsContract} */ @Deprecated public static final String SECONDARY_PHONE_TYPE = @@ -1933,6 +2250,7 @@ public class Contacts { /** * The extra field for an optional third contact phone number. *Type: String
+ * @deprecated see {@link android.provider.ContactsContract} */ @Deprecated public static final String TERTIARY_PHONE = @@ -1942,6 +2260,7 @@ public class Contacts { * The extra field for an optional third contact phone number type. *Type: Either an integer value from {@link android.provider.Contacts.PhonesColumns PhonesColumns}, * or a string specifying a custom label.
+ * @deprecated see {@link android.provider.ContactsContract} */ @Deprecated public static final String TERTIARY_PHONE_TYPE = @@ -1950,6 +2269,7 @@ public class Contacts { /** * The extra field for the contact email address. *Type: String
+ * @deprecated see {@link android.provider.ContactsContract} */ @Deprecated public static final String EMAIL = ContactsContract.Intents.Insert.EMAIL; @@ -1958,6 +2278,7 @@ public class Contacts { * The extra field for the contact email type. *Type: Either an integer value from {@link android.provider.Contacts.ContactMethodsColumns ContactMethodsColumns} * or a string specifying a custom label.
+ * @deprecated see {@link android.provider.ContactsContract} */ @Deprecated public static final String EMAIL_TYPE = ContactsContract.Intents.Insert.EMAIL_TYPE; @@ -1965,6 +2286,7 @@ public class Contacts { /** * The extra field for the email isprimary flag. *Type: boolean
+ * @deprecated see {@link android.provider.ContactsContract} */ @Deprecated public static final String EMAIL_ISPRIMARY = @@ -1973,6 +2295,7 @@ public class Contacts { /** * The extra field for an optional second contact email address. *Type: String
+ * @deprecated see {@link android.provider.ContactsContract} */ @Deprecated public static final String SECONDARY_EMAIL = @@ -1982,6 +2305,7 @@ public class Contacts { * The extra field for an optional second contact email type. *Type: Either an integer value from {@link android.provider.Contacts.ContactMethodsColumns ContactMethodsColumns} * or a string specifying a custom label.
+ * @deprecated see {@link android.provider.ContactsContract} */ @Deprecated public static final String SECONDARY_EMAIL_TYPE = @@ -1990,6 +2314,7 @@ public class Contacts { /** * The extra field for an optional third contact email address. *Type: String
+ * @deprecated see {@link android.provider.ContactsContract} */ @Deprecated public static final String TERTIARY_EMAIL = @@ -1999,6 +2324,7 @@ public class Contacts { * The extra field for an optional third contact email type. *Type: Either an integer value from {@link android.provider.Contacts.ContactMethodsColumns ContactMethodsColumns} * or a string specifying a custom label.
+ * @deprecated see {@link android.provider.ContactsContract} */ @Deprecated public static final String TERTIARY_EMAIL_TYPE = @@ -2007,6 +2333,7 @@ public class Contacts { /** * The extra field for the contact postal address. *Type: String
+ * @deprecated see {@link android.provider.ContactsContract} */ @Deprecated public static final String POSTAL = ContactsContract.Intents.Insert.POSTAL; @@ -2015,6 +2342,7 @@ public class Contacts { * The extra field for the contact postal address type. *Type: Either an integer value from {@link android.provider.Contacts.ContactMethodsColumns ContactMethodsColumns} * or a string specifying a custom label.
+ * @deprecated see {@link android.provider.ContactsContract} */ @Deprecated public static final String POSTAL_TYPE = ContactsContract.Intents.Insert.POSTAL_TYPE; @@ -2022,6 +2350,7 @@ public class Contacts { /** * The extra field for the postal isprimary flag. *Type: boolean
+ * @deprecated see {@link android.provider.ContactsContract} */ @Deprecated public static final String POSTAL_ISPRIMARY = ContactsContract.Intents.Insert.POSTAL_ISPRIMARY; @@ -2029,6 +2358,7 @@ public class Contacts { /** * The extra field for an IM handle. *Type: String
+ * @deprecated see {@link android.provider.ContactsContract} */ @Deprecated public static final String IM_HANDLE = ContactsContract.Intents.Insert.IM_HANDLE; @@ -2037,6 +2367,7 @@ public class Contacts { * The extra field for the IM protocol *Type: the result of {@link Contacts.ContactMethods#encodePredefinedImProtocol} * or {@link Contacts.ContactMethods#encodeCustomImProtocol}.
+ * @deprecated see {@link android.provider.ContactsContract} */ @Deprecated public static final String IM_PROTOCOL = ContactsContract.Intents.Insert.IM_PROTOCOL; @@ -2044,6 +2375,7 @@ public class Contacts { /** * The extra field for the IM isprimary flag. *Type: boolean
+ * @deprecated see {@link android.provider.ContactsContract} */ @Deprecated public static final String IM_ISPRIMARY = ContactsContract.Intents.Insert.IM_ISPRIMARY; diff --git a/core/java/android/provider/ContactsContract.java b/core/java/android/provider/ContactsContract.java index 6b2ab3f3608f8..f65ceee54c450 100644 --- a/core/java/android/provider/ContactsContract.java +++ b/core/java/android/provider/ContactsContract.java @@ -40,8 +40,6 @@ import java.io.InputStream; /** * The contract between the contacts provider and applications. Contains definitions * for the supported URIs and columns. These APIs supersede {@link Contacts}. - * - * @hide */ @SuppressWarnings("unused") public final class ContactsContract { @@ -228,7 +226,7 @@ public final class ContactsContract { public static final String IN_VISIBLE_GROUP = "in_visible_group"; /** - * Contact presence status. See {@link PresenceColumns} + * Contact presence status. See {@link Presence} * for individual status definitions. This column is only returned if explicitly * requested in the query projection. *Type: NUMBER
@@ -320,7 +318,7 @@ public final class ContactsContract { /** * Build a {@link #CONTENT_LOOKUP_URI} lookup {@link Uri} using the - * given {@link Contacts#_ID} and {@link Contacts#LOOKUP_KEY}. + * given {@link android.provider.ContactsContract.Contacts#_ID} and {@link #LOOKUP_KEY}. */ public static Uri getLookupUri(long contactId, String lookupKey) { return ContentUris.withAppendedId(Uri.withAppendedPath(Contacts.CONTENT_LOOKUP_URI, @@ -460,7 +458,8 @@ public final class ContactsContract { /** * The directory twig for this sub-table. The URI can be followed by an optional - * type-to-filter, similar to {@link Contacts#CONTENT_FILTER_URI}. + * type-to-filter, similar to + * {@link android.provider.ContactsContract.Contacts#CONTENT_FILTER_URI}. */ public static final String CONTENT_DIRECTORY = "suggestions"; } @@ -604,8 +603,9 @@ public final class ContactsContract { public static final int AGGREGATION_MODE_DISABLED = 3; /** - * Build a {@link Contacts#CONTENT_LOOKUP_URI} style {@link Uri} for the - * parent {@link Contacts} entry of the given {@link RawContacts} entry. + * Build a {@link android.provider.ContactsContract.Contacts#CONTENT_LOOKUP_URI} + * style {@link Uri} for the parent {@link android.provider.ContactsContract.Contacts} + * entry of the given {@link RawContacts} entry. */ public static Uri getContactLookupUri(ContentResolver resolver, Uri rawContactUri) { // TODO: use a lighter query by joining rawcontacts with contacts in provider @@ -769,8 +769,9 @@ public final class ContactsContract { public static final String CONTENT_TYPE = "vnd.android.cursor.dir/data"; /** - * Build a {@link Contacts#CONTENT_LOOKUP_URI} style {@link Uri} for the - * parent {@link Contacts} entry of the given {@link Data} entry. + * Build a {@link android.provider.ContactsContract.Contacts#CONTENT_LOOKUP_URI} + * style {@link Uri} for the parent {@link android.provider.ContactsContract.Contacts} + * entry of the given {@link Data} entry. */ public static Uri getContactLookupUri(ContentResolver resolver, Uri dataUri) { final Cursor cursor = resolver.query(dataUri, new String[] { @@ -1104,7 +1105,7 @@ public final class ContactsContract { /** * The content:// style URI for all data records of the - * {@link Phone#CONTENT_ITEM_TYPE} MIME type, combined with the + * {@link #CONTENT_ITEM_TYPE} MIME type, combined with the * associated raw contact and aggregate contact data. */ public static final Uri CONTENT_URI = Uri.withAppendedPath(Data.CONTENT_URI, @@ -1112,7 +1113,7 @@ public final class ContactsContract { /** * The content:// style URL for phone lookup using a filter. The filter returns - * records of MIME type {@link Phone#CONTENT_ITEM_TYPE}. The filter is applied + * records of MIME type {@link #CONTENT_ITEM_TYPE}. The filter is applied * to display names as well as phone numbers. The filter argument should be passed * as an additional path segment after this URI. */ @@ -1168,7 +1169,7 @@ public final class ContactsContract { /** * Return the string resource that best describes the given - * {@link CommonColumns#TYPE}. Will always return a valid resource. + * {@link #TYPE}. Will always return a valid resource. */ public static final int getTypeLabelResource(int type) { switch (type) { @@ -1198,8 +1199,8 @@ public final class ContactsContract { /** * Return a {@link CharSequence} that best describes the given type, - * possibly substituting the given {@link CommonColumns#LABEL} value - * for {@link BaseTypes#TYPE_CUSTOM}. + * possibly substituting the given {@link #LABEL} value + * for {@link #TYPE_CUSTOM}. */ public static final CharSequence getTypeLabel(Resources res, int type, CharSequence label) { @@ -1231,7 +1232,7 @@ public final class ContactsContract { /** * The content:// style URI for all data records of the - * {@link Email#CONTENT_ITEM_TYPE} MIME type, combined with the + * {@link #CONTENT_ITEM_TYPE} MIME type, combined with the * associated raw contact and aggregate contact data. */ public static final Uri CONTENT_URI = Uri.withAppendedPath(Data.CONTENT_URI, @@ -1247,7 +1248,7 @@ public final class ContactsContract { /** * The content:// style URL for email lookup using a filter. The filter returns - * records of MIME type {@link Email#CONTENT_ITEM_TYPE}. The filter is applied + * records of MIME type {@link #CONTENT_ITEM_TYPE}. The filter is applied * to display names as well as email addresses. The filter argument should be passed * as an additional path segment after this URI. */ @@ -1267,7 +1268,7 @@ public final class ContactsContract { /** * Return the string resource that best describes the given - * {@link CommonColumns#TYPE}. Will always return a valid resource. + * {@link #TYPE}. Will always return a valid resource. */ public static final int getTypeLabelResource(int type) { switch (type) { @@ -1281,8 +1282,8 @@ public final class ContactsContract { /** * Return a {@link CharSequence} that best describes the given type, - * possibly substituting the given {@link CommonColumns#LABEL} value - * for {@link BaseTypes#TYPE_CUSTOM}. + * possibly substituting the given {@link #LABEL} value + * for {@link #TYPE_CUSTOM}. */ public static final CharSequence getTypeLabel(Resources res, int type, CharSequence label) { @@ -1393,7 +1394,7 @@ public final class ContactsContract { /** * Return the string resource that best describes the given - * {@link CommonColumns#TYPE}. Will always return a valid resource. + * {@link #TYPE}. Will always return a valid resource. */ public static final int getTypeLabelResource(int type) { switch (type) { @@ -1406,8 +1407,8 @@ public final class ContactsContract { /** * Return a {@link CharSequence} that best describes the given type, - * possibly substituting the given {@link CommonColumns#LABEL} value - * for {@link BaseTypes#TYPE_CUSTOM}. + * possibly substituting the given {@link #LABEL} value + * for {@link #TYPE_CUSTOM}. */ public static final CharSequence getTypeLabel(Resources res, int type, CharSequence label) { @@ -1462,7 +1463,7 @@ public final class ContactsContract { /** * Return the string resource that best describes the given - * {@link CommonColumns#TYPE}. Will always return a valid resource. + * {@link #TYPE}. Will always return a valid resource. */ public static final int getTypeLabelResource(int type) { switch (type) { @@ -1475,8 +1476,8 @@ public final class ContactsContract { /** * Return a {@link CharSequence} that best describes the given type, - * possibly substituting the given {@link CommonColumns#LABEL} value - * for {@link BaseTypes#TYPE_CUSTOM}. + * possibly substituting the given {@link #LABEL} value + * for {@link #TYPE_CUSTOM}. */ public static final CharSequence getTypeLabel(Resources res, int type, CharSequence label) { @@ -1490,7 +1491,7 @@ public final class ContactsContract { /** * Return the string resource that best describes the given - * {@link Im#PROTOCOL}. Will always return a valid resource. + * {@link #PROTOCOL}. Will always return a valid resource. */ public static final int getProtocolLabelResource(int type) { switch (type) { @@ -1576,7 +1577,7 @@ public final class ContactsContract { /** * Return the string resource that best describes the given - * {@link CommonColumns#TYPE}. Will always return a valid resource. + * {@link #TYPE}. Will always return a valid resource. */ public static final int getTypeLabelResource(int type) { switch (type) { @@ -1588,8 +1589,8 @@ public final class ContactsContract { /** * Return a {@link CharSequence} that best describes the given type, - * possibly substituting the given {@link CommonColumns#LABEL} value - * for {@link BaseTypes#TYPE_CUSTOM}. + * possibly substituting the given {@link #LABEL} value + * for {@link #TYPE_CUSTOM}. */ public static final CharSequence getTypeLabel(Resources res, int type, CharSequence label) {