diff options
| author | Makoto Onuki <omakoto@google.com> | 2011-08-26 14:50:12 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-08-26 14:50:12 -0700 |
| commit | 754b394bdfeff697bea73fa0977d2c91ef8c8886 (patch) | |
| tree | 2f5f1b8d82086947020be416c3d0f751f79382ba | |
| parent | fedd53b82b0e15c2678a9930a21957cf531da20b (diff) | |
| parent | fc6d2fde25ccf00174b7419d91a76b2fc52773ae (diff) | |
| download | frameworks_base-754b394bdfeff697bea73fa0977d2c91ef8c8886.zip frameworks_base-754b394bdfeff697bea73fa0977d2c91ef8c8886.tar.gz frameworks_base-754b394bdfeff697bea73fa0977d2c91ef8c8886.tar.bz2 | |
Merge "Define mime-types for stream items"
| -rw-r--r-- | api/current.txt | 4 | ||||
| -rw-r--r-- | core/java/android/provider/ContactsContract.java | 21 |
2 files changed, 25 insertions, 0 deletions
diff --git a/api/current.txt b/api/current.txt index b962234..40b63b1 100644 --- a/api/current.txt +++ b/api/current.txt @@ -16673,14 +16673,18 @@ package android.provider { } public static final class ContactsContract.StreamItems implements android.provider.BaseColumns android.provider.ContactsContract.StreamItemsColumns { + field public static final java.lang.String CONTENT_ITEM_TYPE = "vnd.android.cursor.item/stream_item"; field public static final android.net.Uri CONTENT_LIMIT_URI; field public static final android.net.Uri CONTENT_PHOTO_URI; + field public static final java.lang.String CONTENT_TYPE = "vnd.android.cursor.dir/stream_item"; field public static final android.net.Uri CONTENT_URI; field public static final java.lang.String MAX_ITEMS = "max_items"; } public static final class ContactsContract.StreamItems.StreamItemPhotos implements android.provider.BaseColumns android.provider.ContactsContract.StreamItemPhotosColumns { field public static final java.lang.String CONTENT_DIRECTORY = "photo"; + field public static final java.lang.String CONTENT_ITEM_TYPE = "vnd.android.cursor.item/stream_item_photo"; + field public static final java.lang.String CONTENT_TYPE = "vnd.android.cursor.dir/stream_item_photo"; } protected static abstract interface ContactsContract.StreamItemsColumns { diff --git a/core/java/android/provider/ContactsContract.java b/core/java/android/provider/ContactsContract.java index e205f97..e9221fe 100644 --- a/core/java/android/provider/ContactsContract.java +++ b/core/java/android/provider/ContactsContract.java @@ -3024,6 +3024,16 @@ public final class ContactsContract { Uri.withAppendedPath(AUTHORITY_URI, "stream_items_limit"); /** + * The MIME type of a directory of stream items. + */ + public static final String CONTENT_TYPE = "vnd.android.cursor.dir/stream_item"; + + /** + * The MIME type of a single stream item. + */ + public static final String CONTENT_ITEM_TYPE = "vnd.android.cursor.item/stream_item"; + + /** * Queries to {@link ContactsContract.StreamItems#CONTENT_LIMIT_URI} will * contain this column, with the value indicating the maximum number of * stream items that will be stored under any single raw contact. @@ -3050,6 +3060,17 @@ public final class ContactsContract { * The directory twig for this sub-table */ public static final String CONTENT_DIRECTORY = "photo"; + + /** + * The MIME type of a directory of stream item photos. + */ + public static final String CONTENT_TYPE = "vnd.android.cursor.dir/stream_item_photo"; + + /** + * The MIME type of a single stream item photo. + */ + public static final String CONTENT_ITEM_TYPE + = "vnd.android.cursor.item/stream_item_photo"; } } |