Merge "Add API for auto-complete ranking improvement." (18cc57fb) · Commits · e / os / android_frameworks_base

api/current.txt

+11 −0

Original line number	Diff line number	Diff line
		@@ -15267,6 +15267,8 @@ package android.provider {
		field public static final java.lang.String DIRECTORY_PARAM_KEY = "directory";
		field public static final java.lang.String INCLUDE_PROFILE = "include_profile";
		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";
		field public static final java.lang.String PRIMARY_ACCOUNT_TYPE = "type_for_primary_account";
		}

		public static final class ContactsContract.AggregationExceptions implements android.provider.BaseColumns {
		@@ -15609,6 +15611,15 @@ package android.provider {
		protected static abstract interface ContactsContract.DataColumnsWithJoins implements android.provider.BaseColumns android.provider.ContactsContract.ContactNameColumns android.provider.ContactsContract.ContactOptionsColumns android.provider.ContactsContract.ContactStatusColumns android.provider.ContactsContract.ContactsColumns android.provider.ContactsContract.DataColumns android.provider.ContactsContract.RawContactsColumns android.provider.ContactsContract.StatusColumns {
		}

		public static final class ContactsContract.DataUsageFeedback {
		ctor public ContactsContract.DataUsageFeedback();
		field public static final android.net.Uri FEEDBACK_URI;
		field public static final java.lang.String USAGE_TYPE = "type";
		field public static final java.lang.String USAGE_TYPE_CALL = "call";
		field public static final java.lang.String USAGE_TYPE_LONG_TEXT = "long_text";
		field public static final java.lang.String USAGE_TYPE_SHORT_TEXT = "short_text";
		}

		public static final class ContactsContract.Directory implements android.provider.BaseColumns {
		method public static void notifyDirectoryChange(android.content.ContentResolver);
		field public static final java.lang.String ACCOUNT_NAME = "accountName";

core/java/android/provider/ContactsContract.java

+0 −3

Original line number	Diff line number	Diff line
		@@ -163,14 +163,12 @@ public final class ContactsContract {
		* obtaining possible recipients, letting the provider know which account is selected during
		* the composition. The provider may use the "primary account" information to optimize
		* the search result.
		* @hide
		*/
		public static final String PRIMARY_ACCOUNT_NAME = "name_for_primary_account";

		/**
		* A query parameter specifing a primary account. This parameter should be used with
		* {@link #PRIMARY_ACCOUNT_NAME}. See the doc in {@link #PRIMARY_ACCOUNT_NAME}.
		* @hide
		*/
		public static final String PRIMARY_ACCOUNT_TYPE = "type_for_primary_account";

		@@ -6317,7 +6315,6 @@ public final class ContactsContract {
		* boolean successful = resolver.update(uri, new ContentValues(), null, null) > 0;
		* </pre>
		* </p>
		* @hide
		*/
		public static final class DataUsageFeedback {