Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge change 25894 into eclair

Browse Source 
* changes:
  Adding CONTENT_TYPE to CommonDataKinds.Email
This commit is contained in:
Android (Google) Code Review
2009-09-20 10:49:05 -04:00
parent 4492bcd8b0 abf15c30c1
commit eb96a3c3d3
1 changed files with 5 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
core/java/android/provider/ContactsContract.java
View File

@@ -1137,6 +1137,11 @@ public final class ContactsContract {
/** MIME type used when storing this in data table. */ /** MIME type used when storing this in data table. */
public static final String CONTENT_ITEM_TYPE = "vnd.android.cursor.item/email_v2"; public static final String CONTENT_ITEM_TYPE = "vnd.android.cursor.item/email_v2";
/**
* The MIME type of {@link #CONTENT_URI} providing a directory of email addresses.
*/
public static final String CONTENT_TYPE = "vnd.android.cursor.dir/email_v2";
/** /**
* The content:// style URI for all data records of the * The content:// style URI for all data records of the
* {@link Email#CONTENT_ITEM_TYPE} MIME type, combined with the * {@link Email#CONTENT_ITEM_TYPE} MIME type, combined with the
@@ -1153,9 +1158,6 @@ public final class ContactsContract {
public static final Uri CONTENT_LOOKUP_URI = Uri.withAppendedPath(CONTENT_URI, public static final Uri CONTENT_LOOKUP_URI = Uri.withAppendedPath(CONTENT_URI,
"lookup"); "lookup");
@Deprecated
public static final Uri CONTENT_FILTER_EMAIL_URI = CONTENT_LOOKUP_URI;
/** /**
* The content:// style URL for email lookup using a filter. The filter returns * 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 Email#CONTENT_ITEM_TYPE}. The filter is applied
@@ -1680,24 +1682,12 @@ public final class ContactsContract {
*/ */
public static final int TYPE_KEEP_TOGETHER = 1; public static final int TYPE_KEEP_TOGETHER = 1;
@Deprecated
public static final int TYPE_KEEP_IN = 1;
/** /**
* Makes sure that the specified raw contacts are NOT included in the same * Makes sure that the specified raw contacts are NOT included in the same
* aggregate contact. * aggregate contact.
*/ */
public static final int TYPE_KEEP_SEPARATE = 2; public static final int TYPE_KEEP_SEPARATE = 2;
@Deprecated
public static final int TYPE_KEEP_OUT = 2;
@Deprecated
public static final String CONTACT_ID = "contact_id";
@Deprecated
public static final String RAW_CONTACT_ID = "raw_contact_id";
/** /**
* A reference to the {@link RawContacts#_ID} of the raw contact that the rule applies to. * A reference to the {@link RawContacts#_ID} of the raw contact that the rule applies to.
*/ */