diff options
| -rw-r--r-- | core/java/android/provider/ContactsContract.java | 30 | ||||
| -rw-r--r-- | core/java/android/provider/SocialContract.java | 12 |
2 files changed, 21 insertions, 21 deletions
diff --git a/core/java/android/provider/ContactsContract.java b/core/java/android/provider/ContactsContract.java index 57f9af2786d5..0485a1083388 100644 --- a/core/java/android/provider/ContactsContract.java +++ b/core/java/android/provider/ContactsContract.java @@ -18,8 +18,6 @@ package android.provider; import android.graphics.BitmapFactory; import android.net.Uri; -import android.provider.BaseColumns; -import android.provider.Im.ProviderNames; /** * The contract between the contacts provider and applications. Contains definitions @@ -63,13 +61,13 @@ public final class ContactsContract { * <P>Type: INTEGER REFERENCES data(_id)</P> */ public static final String PRIMARY_PHONE_ID = "primary_phone_id"; - + /** * Reference to the row in the data table holding the primary email address. * <P>Type: INTEGER REFERENCES data(_id)</P> */ public static final String PRIMARY_EMAIL_ID = "primary_email_id"; - + /** * Reference to the row in the data table holding the photo. * <P>Type: INTEGER REFERENCES data(_id)</P> @@ -151,7 +149,7 @@ public final class ContactsContract { * The content:// style URL for filtering people by email address. The * filter argument should be passed as an additional path segment after * this URI. - * + * * @hide */ public static final Uri CONTENT_FILTER_EMAIL_URI = Uri.withAppendedPath(CONTENT_URI, "filter_email"); @@ -197,7 +195,8 @@ public final class ContactsContract { public static final String MIMETYPE = "mimetype"; /** - * A reference to the {@link Contacts#_ID} that this data belongs to. + * A reference to the {@link android.provider.ContactsContract.Contacts#_ID} + * that this data belongs to. */ public static final String CONTACT_ID = "contact_id"; @@ -293,7 +292,8 @@ public final class ContactsContract { public static final String MIMETYPE = "mimetype"; /** - * A reference to the {@link Contacts#_ID} that this data belongs to. + * A reference to the {@link android.provider.ContactsContract.Contacts#_ID} that this + * data belongs to. */ public static final String CONTACT_ID = "contact_id"; } @@ -446,7 +446,7 @@ public final class ContactsContract { * <P>Type: TEXT</P> */ public static final String NUMBER = "data3"; - + } /** @@ -493,9 +493,9 @@ public final class ContactsContract { public static final int TYPE_HOME = 1; public static final int TYPE_WORK = 2; public static final int TYPE_OTHER = 3; - + public static final String PROTOCOL = "data5"; - + /** * The predefined IM protocol types. The protocol can either be non-present, one * of these types, or a free-form string. These cases are encoded in the PROTOCOL @@ -557,7 +557,7 @@ public final class ContactsContract { * <P>Type: INTEGER (if set, non-0 means true)</P> */ public static final String ISPRIMARY = "data5"; - + } /** @@ -593,18 +593,18 @@ public final class ContactsContract { */ public static final String NOTE = "data1"; } - + public static final class CustomRingtone implements BaseCommonColumns { private CustomRingtone() {} - + public static final String CONTENT_ITEM_TYPE = "vnd.android.cursor.item/custom_ringtone"; - + /** * Whether to send the number to voicemail. * <P>Type: INTEGER (if set, non-0 means true)</P> */ public static final String SEND_TO_VOICEMAIL = "data1"; - + /** * The ringtone uri. * <P>Type: TEXT</P> diff --git a/core/java/android/provider/SocialContract.java b/core/java/android/provider/SocialContract.java index f72bbb1840b1..8254851d2d36 100644 --- a/core/java/android/provider/SocialContract.java +++ b/core/java/android/provider/SocialContract.java @@ -68,8 +68,8 @@ public class SocialContract { public static final String IN_REPLY_TO = "in_reply_to"; /** - * Reference to the {@link Contacts#_ID} that authored this social - * activity. This field is analogous to the <code>atom:author</code> + * Reference to the {@link android.provider.ContactsContract.Contacts#_ID} that authored + * this social activity. This field is analogous to the <code>atom:author</code> * element defined in RFC 4287. * <p> * Type: INTEGER @@ -77,8 +77,8 @@ public class SocialContract { public static final String AUTHOR_CONTACT_ID = "author_contact_id"; /** - * Optional reference to the {@link Contacts#_ID} this social activity - * is targeted towards. If more than one direct target, this field may + * Optional reference to the {@link android.provider.ContactsContract.Contacts#_ID} this + * social activity is targeted towards. If more than one direct target, this field may * be left undefined. This field is analogous to the * <code>activity:target</code> element defined in the Atom Activity * Extensions Internet-Draft. @@ -155,8 +155,8 @@ public class SocialContract { public static final Uri CONTENT_URI = Uri.withAppendedPath(AUTHORITY_URI, "activities"); /** - * The content:// style URI for this table filtered to the set of - * social activities authored by a specific {@link Contact#_ID}. + * The content:// style URI for this table filtered to the set of social activities + * authored by a specific {@link android.provider.ContactsContract.Contacts#_ID}. */ public static final Uri CONTENT_AUTHORED_BY_URI = Uri.withAppendedPath(CONTENT_URI, "authored_by"); |