Merge "Unhide more ContactsContracts fields" (1d80a877) · Commits · e / os / android_frameworks_base

api/current.txt

+15 −0

Original line number	Diff line number	Diff line
		@@ -23197,6 +23197,7 @@ package android.provider {
		field public static final java.lang.String AUTHORITY = "com.android.contacts";
		field public static final android.net.Uri AUTHORITY_URI;
		field public static final java.lang.String CALLER_IS_SYNCADAPTER = "caller_is_syncadapter";
		field public static final java.lang.String DEFERRED_SNIPPETING = "deferred_snippeting";
		field public static final java.lang.String DIRECTORY_PARAM_KEY = "directory";
		field public static final java.lang.String LIMIT_PARAM_KEY = "limit";
		field public static final java.lang.String PRIMARY_ACCOUNT_NAME = "name_for_primary_account";
		@@ -23500,6 +23501,7 @@ package android.provider {
		method public static java.io.InputStream openContactPhotoInputStream(android.content.ContentResolver, android.net.Uri, boolean);
		method public static java.io.InputStream openContactPhotoInputStream(android.content.ContentResolver, android.net.Uri);
		field public static final android.net.Uri CONTENT_FILTER_URI;
		field public static final android.net.Uri CONTENT_FREQUENT_URI;
		field public static final android.net.Uri CONTENT_GROUP_URI;
		field public static final java.lang.String CONTENT_ITEM_TYPE = "vnd.android.cursor.item/contact";
		field public static final android.net.Uri CONTENT_LOOKUP_URI;
		@@ -23545,6 +23547,7 @@ package android.provider {
		field public static final java.lang.String IN_VISIBLE_GROUP = "in_visible_group";
		field public static final java.lang.String IS_USER_PROFILE = "is_user_profile";
		field public static final java.lang.String LOOKUP_KEY = "lookup";
		field public static final java.lang.String NAME_RAW_CONTACT_ID = "name_raw_contact_id";
		field public static final java.lang.String PHOTO_FILE_ID = "photo_file_id";
		field public static final java.lang.String PHOTO_ID = "photo_id";
		field public static final java.lang.String PHOTO_THUMBNAIL_URI = "photo_thumb_uri";
		@@ -23580,6 +23583,7 @@ package android.provider {
		field public static final java.lang.String IS_SUPER_PRIMARY = "is_super_primary";
		field public static final java.lang.String MIMETYPE = "mimetype";
		field public static final java.lang.String RAW_CONTACT_ID = "raw_contact_id";
		field public static final java.lang.String RES_PACKAGE = "res_package";
		field public static final java.lang.String SYNC1 = "data_sync1";
		field public static final java.lang.String SYNC2 = "data_sync2";
		field public static final java.lang.String SYNC3 = "data_sync3";
		@@ -23683,11 +23687,13 @@ package android.provider {
		field public static final java.lang.String GROUP_IS_READ_ONLY = "group_is_read_only";
		field public static final java.lang.String GROUP_VISIBLE = "group_visible";
		field public static final java.lang.String NOTES = "notes";
		field public static final java.lang.String RES_PACKAGE = "res_package";
		field public static final java.lang.String SHOULD_SYNC = "should_sync";
		field public static final java.lang.String SUMMARY_COUNT = "summ_count";
		field public static final java.lang.String SUMMARY_WITH_PHONES = "summ_phones";
		field public static final java.lang.String SYSTEM_ID = "system_id";
		field public static final java.lang.String TITLE = "title";
		field public static final java.lang.String TITLE_RES = "title_res";
		}

		public static final class ContactsContract.Intents {
		@@ -23840,10 +23846,12 @@ package android.provider {
		}

		protected static abstract interface ContactsContract.RawContactsColumns {
		field public static final java.lang.String ACCOUNT_TYPE_AND_DATA_SET = "account_type_and_data_set";
		field public static final java.lang.String AGGREGATION_MODE = "aggregation_mode";
		field public static final java.lang.String CONTACT_ID = "contact_id";
		field public static final java.lang.String DATA_SET = "data_set";
		field public static final java.lang.String DELETED = "deleted";
		field public static final java.lang.String NAME_VERIFIED = "name_verified";
		field public static final java.lang.String RAW_CONTACT_IS_READ_ONLY = "raw_contact_is_read_only";
		field public static final java.lang.String RAW_CONTACT_IS_USER_PROFILE = "raw_contact_is_user_profile";
		}
		@@ -23855,6 +23863,13 @@ package android.provider {
		field public static final android.net.Uri PROFILE_CONTENT_URI;
		}

		public static class ContactsContract.SearchSnippetColumns {
		ctor public ContactsContract.SearchSnippetColumns();
		field public static final java.lang.String DEFERRED_SNIPPETING_KEY = "deferred_snippeting";
		field public static final java.lang.String SNIPPET = "snippet";
		field public static final java.lang.String SNIPPET_ARGS_PARAM_KEY = "snippet_args";
		}

		public static final class ContactsContract.Settings implements android.provider.ContactsContract.SettingsColumns {
		field public static final java.lang.String CONTENT_ITEM_TYPE = "vnd.android.cursor.item/setting";
		field public static final java.lang.String CONTENT_TYPE = "vnd.android.cursor.dir/setting";

core/java/android/provider/ContactsContract.java

+5 −26

Original line number	Diff line number	Diff line
		@@ -171,8 +171,6 @@ public final class ContactsContract {
		* A key to a boolean in the "extras" bundle of the cursor.
		* The boolean indicates that the provider did not create a snippet and that the client asking
		* for the snippet should do it (true means the snippeting was deferred to the client).
		*
		* @hide
		*/
		public static final String DEFERRED_SNIPPETING = "deferred_snippeting";

		@@ -849,7 +847,6 @@ public final class ContactsContract {
		/**
		* Reference to the row in the RawContacts table holding the contact name.
		* <P>Type: INTEGER REFERENCES raw_contacts(_id)</P>
		* @hide
		*/
		public static final String NAME_RAW_CONTACT_ID = "name_raw_contact_id";

		@@ -1609,8 +1606,7 @@ public final class ContactsContract {
		CONTENT_URI, "strequent");

		/**
		* The content:// style URI for showing frequently contacted person listing.
		* @hide
		* The content:// style URI for showing a list of frequently contacted people.
		*/
		public static final Uri CONTENT_FREQUENT_URI = Uri.withAppendedPath(
		CONTENT_URI, "frequent");
		@@ -2229,7 +2225,6 @@ public final class ContactsContract {
		* type. For applications that need to be aware of the data set, this can
		* be used instead of account type to distinguish sets of data. This is
		* never intended to be used for specifying accounts.
		* @hide
		*/
		public static final String ACCOUNT_TYPE_AND_DATA_SET = "account_type_and_data_set";

		@@ -2273,8 +2268,6 @@ public final class ContactsContract {
		* The default value is "0"
		* </p>
		* <p>Type: INTEGER</p>
		*
		* @hide
		*/
		public static final String NAME_VERIFIED = "name_verified";

		@@ -3793,8 +3786,6 @@ public final class ContactsContract {
		* The package name to use when creating {@link Resources} objects for
		* this data row. This value is only designed for use when building user
		* interfaces, and should not be used to infer the owner.
		*
		* @hide
		*/
		public static final String RES_PACKAGE = "res_package";

		@@ -5096,12 +5087,10 @@ public final class ContactsContract {
		}

		/**
		* Additional column returned by the {@link Contacts#CONTENT_FILTER_URI} providing the
		* explanation of why the filter matched the contact. Specifically, it contains the
		* data elements that matched the query. The overall number of words in the snippet
		* can be capped.
		*
		* @hide
		* Additional column returned by
		* {@link ContactsContract.Contacts#CONTENT_FILTER_URI Contacts.CONTENT_FILTER_URI} explaining
		* why the filter matched the contact. Specifically, it contains the data elements that
		* matched the query. The overall number of words in the snippet can be capped.
		*/
		public static class SearchSnippetColumns {

		@@ -5111,8 +5100,6 @@ public final class ContactsContract {
		* <p>
		* The snippet may contain (parts of) several data elements comprising
		* the contact.
		*
		* @hide
		*/
		public static final String SNIPPET = "snippet";

		@@ -5128,8 +5115,6 @@ public final class ContactsContract {
		* tokens can be returned in total. A negative number indicates how many
		* tokens can be returned per occurrence of the search terms.</li>
		* </ul>
		*
		* @hide
		*/
		public static final String SNIPPET_ARGS_PARAM_KEY = "snippet_args";

		@@ -5140,8 +5125,6 @@ public final class ContactsContract {
		* {@link ContactsContract#DEFERRED_SNIPPETING} in the cursor. If it exists, the client
		* should do its own snippeting. If it doesn't exist, the snippet column in the cursor
		* should already contain a snippetized string.
		*
		* @hide
		*/
		public static final String DEFERRED_SNIPPETING_KEY = "deferred_snippeting";
		}
		@@ -7007,8 +6990,6 @@ public final class ContactsContract {
		* The package name to use when creating {@link Resources} objects for
		* this group. This value is only designed for use when building user
		* interfaces, and should not be used to infer the owner.
		*
		* @hide
		*/
		public static final String RES_PACKAGE = "res_package";

		@@ -7016,8 +6997,6 @@ public final class ContactsContract {
		* The display title of this group to load as a resource from
		* {@link #RES_PACKAGE}, which may be localized.
		* <P>Type: TEXT</P>
		*
		* @hide
		*/
		public static final String TITLE_RES = "title_res";