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

Merge "Unhide social stream APIs for Contacts." into ics-mr1

Browse Source
This commit is contained in:
Dave Santoro
2011-11-08 14:48:21 -08:00
committed by Android (Google) Code Review
parent 650a3e8894 003924c37a
commit b78ae7524e
2 changed files with 58 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

58
api/current.txt
View File

@@ -16611,6 +16611,10 @@ package android.provider {
field public static final java.lang.String PHOTO_FILE_ID = "data14";
}
public static final class ContactsContract.Contacts.StreamItems implements android.provider.ContactsContract.StreamItemsColumns {
field public static final java.lang.String CONTENT_DIRECTORY = "stream_items";
}
protected static abstract interface ContactsContract.ContactsColumns {
field public static final java.lang.String DISPLAY_NAME = "display_name";
field public static final java.lang.String HAS_PHONE_NUMBER = "has_phone_number";
@@ -16868,6 +16872,10 @@ package android.provider {
field public static final java.lang.String DATA_ID = "data_id";
}
public static final class ContactsContract.RawContacts.StreamItems implements android.provider.BaseColumns android.provider.ContactsContract.StreamItemsColumns {
field public static final java.lang.String CONTENT_DIRECTORY = "stream_items";
}
protected static abstract interface ContactsContract.RawContactsColumns {
field public static final java.lang.String AGGREGATION_MODE = "aggregation_mode";
field public static final java.lang.String CONTACT_ID = "contact_id";
@@ -16931,6 +16939,56 @@ package android.provider {
field public static final android.net.Uri PROFILE_CONTENT_URI;
}
public static final class ContactsContract.StreamItemPhotos implements android.provider.BaseColumns android.provider.ContactsContract.StreamItemPhotosColumns {
field public static final java.lang.String PHOTO = "photo";
}
protected static abstract interface ContactsContract.StreamItemPhotosColumns {
field public static final java.lang.String PHOTO_FILE_ID = "photo_file_id";
field public static final java.lang.String PHOTO_URI = "photo_uri";
field public static final java.lang.String SORT_INDEX = "sort_index";
field public static final java.lang.String STREAM_ITEM_ID = "stream_item_id";
field public static final java.lang.String SYNC1 = "stream_item_photo_sync1";
field public static final java.lang.String SYNC2 = "stream_item_photo_sync2";
field public static final java.lang.String SYNC3 = "stream_item_photo_sync3";
field public static final java.lang.String SYNC4 = "stream_item_photo_sync4";
}
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 {
field public static final java.lang.String ACCOUNT_NAME = "account_name";
field public static final java.lang.String ACCOUNT_TYPE = "account_type";
field public static final java.lang.String COMMENTS = "comments";
field public static final java.lang.String CONTACT_ID = "contact_id";
field public static final java.lang.String CONTACT_LOOKUP_KEY = "contact_lookup";
field public static final java.lang.String DATA_SET = "data_set";
field public static final java.lang.String RAW_CONTACT_ID = "raw_contact_id";
field public static final java.lang.String RAW_CONTACT_SOURCE_ID = "raw_contact_source_id";
field public static final java.lang.String RES_ICON = "icon";
field public static final java.lang.String RES_LABEL = "label";
field public static final java.lang.String RES_PACKAGE = "res_package";
field public static final java.lang.String SYNC1 = "stream_item_sync1";
field public static final java.lang.String SYNC2 = "stream_item_sync2";
field public static final java.lang.String SYNC3 = "stream_item_sync3";
field public static final java.lang.String SYNC4 = "stream_item_sync4";
field public static final java.lang.String TEXT = "text";
field public static final java.lang.String TIMESTAMP = "timestamp";
}
protected static abstract interface ContactsContract.SyncColumns implements android.provider.ContactsContract.BaseSyncColumns {
field public static final java.lang.String ACCOUNT_NAME = "account_name";
field public static final java.lang.String ACCOUNT_TYPE = "account_type";

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

@@ -1673,7 +1673,6 @@ public final class ContactsContract {
* Querying for social stream data requires android.permission.READ_SOCIAL_STREAM
* permission.
* </p>
* @hide
*/
public static final class StreamItems implements StreamItemsColumns {
/**
@@ -2736,7 +2735,6 @@ public final class ContactsContract {
* inserting or updating social stream items requires android.permission.WRITE_SOCIAL_STREAM
* permission.
* </p>
* @hide
*/
public static final class StreamItems implements BaseColumns, StreamItemsColumns {
/**
@@ -3149,7 +3147,6 @@ public final class ContactsContract {
* </pre>
* </dd>
* </dl>
* @hide
*/
public static final class StreamItems implements BaseColumns, StreamItemsColumns {
/**
@@ -3247,7 +3244,6 @@ public final class ContactsContract {
* Columns in the StreamItems table.
*
* @see ContactsContract.StreamItems
* @hide
*/
protected interface StreamItemsColumns {
/**
@@ -3538,7 +3534,6 @@ public final class ContactsContract {
* <pre>
* </dd>
* </dl>
* @hide
*/
public static final class StreamItemPhotos implements BaseColumns, StreamItemPhotosColumns {
/**
@@ -3566,7 +3561,6 @@ public final class ContactsContract {
* Columns in the StreamItemPhotos table.
*
* @see ContactsContract.StreamItemPhotos
* @hide
*/
protected interface StreamItemPhotosColumns {
/**