am 038fbc5d: Merge "Add new apis to CP2" into jb-mr2-dev

* commit '038fbc5d099c6fb8903ccc00c0988d482bfb8046':
  Add new apis to CP2
This commit is contained in:
Yorke Lee
2013-03-27 09:48:26 -07:00
committed by Android Git Automerger
2 changed files with 47 additions and 0 deletions

View File

@@ -17935,6 +17935,13 @@ package android.provider {
field public static final java.lang.String TYPE = "data2";
}
public static final class ContactsContract.CommonDataKinds.Contactables implements android.provider.ContactsContract.CommonDataKinds.CommonColumns android.provider.ContactsContract.DataColumnsWithJoins {
ctor public ContactsContract.CommonDataKinds.Contactables();
field public static final android.net.Uri CONTENT_FILTER_URI;
field public static final android.net.Uri CONTENT_URI;
field public static final java.lang.String VISIBLE_CONTACTS_ONLY = "visible_contacts_only";
}
public static final class ContactsContract.CommonDataKinds.Email implements android.provider.ContactsContract.CommonDataKinds.CommonColumns android.provider.ContactsContract.DataColumnsWithJoins {
method public static final java.lang.CharSequence getTypeLabel(android.content.res.Resources, int, java.lang.CharSequence);
method public static final int getTypeLabelResource(int);
@@ -18228,6 +18235,7 @@ package android.provider {
method public static android.net.Uri getContactLookupUri(android.content.ContentResolver, android.net.Uri);
field public static final java.lang.String CONTENT_TYPE = "vnd.android.cursor.dir/data";
field public static final android.net.Uri CONTENT_URI;
field public static final java.lang.String VISIBLE_CONTACTS_ONLY = "visible_contacts_only";
}
protected static abstract interface ContactsContract.DataColumns {

View File

@@ -4324,6 +4324,13 @@ public final class ContactsContract {
*/
public static final Uri CONTENT_URI = Uri.withAppendedPath(AUTHORITY_URI, "data");
/**
* A boolean parameter for {@link Data#CONTENT_URI}.
* This specifies whether or not the returned data items should be filtered to show
* data items belonging to visible contacts only.
*/
public static final String VISIBLE_CONTACTS_ONLY = "visible_contacts_only";
/**
* The MIME type of the results from {@link #CONTENT_URI}.
*/
@@ -6833,6 +6840,38 @@ public final class ContactsContract {
public static final Uri CONTENT_FILTER_URI = Uri.withAppendedPath(CONTENT_URI,
"filter");
}
/**
* A special class of data items, used to refer to types of data that can be used to attempt
* to start communicating with a person ({@link Phone} and {@link Email}). Note that this
* is NOT a separate data kind.
*
* This URI allows the ContactsProvider to return a unified result for data items that users
* can use to initiate communications with another contact. {@link Phone} and {@link Email}
* are the current data types in this category.
*/
public static final class Contactables implements DataColumnsWithJoins, CommonColumns {
/**
* The content:// style URI for these data items, which requests a directory of data
* rows matching the selection criteria.
*/
public static final Uri CONTENT_URI = Uri.withAppendedPath(Data.CONTENT_URI,
"contactables");
/**
* The content:// style URI for these data items, which allows for a query parameter to
* be appended onto the end to filter for data items matching the query.
*/
public static final Uri CONTENT_FILTER_URI = Uri.withAppendedPath(
Contactables.CONTENT_URI, "filter");
/**
* A boolean parameter for {@link Data#CONTENT_URI}.
* This specifies whether or not the returned data items should be filtered to show
* data items belonging to visible contacts only.
*/
public static final String VISIBLE_CONTACTS_ONLY = "visible_contacts_only";
}
}
/**