Merge "CloudSearch API: Adds the prefix of "android.app.cloudsearch." to avoid clashes." (e1054520) · Commits · e / os / android_frameworks_base

core/api/system-current.txt

+19 −19

Original line number	Diff line number	Diff line
		@@ -1656,8 +1656,8 @@ package android.app.cloudsearch {
		method @NonNull public android.os.Bundle getSearchConstraints();
		method @NonNull public String getSource();
		method public void writeToParcel(@NonNull android.os.Parcel, int);
		field public static final String CONSTRAINT_IS_PRESUBMIT_SUGGESTION = "IS_PRESUBMIT_SUGGESTION";
		field public static final String CONSTRAINT_SEARCH_PROVIDER_FILTER = "SEARCH_PROVIDER_FILTER";
		field public static final String CONSTRAINT_IS_PRESUBMIT_SUGGESTION = "android.app.cloudsearch.IS_PRESUBMIT_SUGGESTION";
		field public static final String CONSTRAINT_SEARCH_PROVIDER_FILTER = "android.app.cloudsearch.SEARCH_PROVIDER_FILTER";
		field @NonNull public static final android.os.Parcelable.Creator<android.app.cloudsearch.SearchRequest> CREATOR;
		}

		@@ -1699,23 +1699,23 @@ package android.app.cloudsearch {
		method @NonNull public String getTitle();
		method public void writeToParcel(@NonNull android.os.Parcel, int);
		field @NonNull public static final android.os.Parcelable.Creator<android.app.cloudsearch.SearchResult> CREATOR;
		field public static final String EXTRAINFO_ACTION_BUTTON_IMAGE_PREREGISTERING = "ACTION_BUTTON_IMAGE";
		field public static final String EXTRAINFO_ACTION_BUTTON_TEXT_PREREGISTERING = "ACTION_BUTTON_TEXT";
		field public static final String EXTRAINFO_APP_BADGES = "APP_BADGES";
		field public static final String EXTRAINFO_APP_CONTAINS_ADS_DISCLAIMER = "APP_CONTAINS_ADS_DISCLAIMER";
		field public static final String EXTRAINFO_APP_CONTAINS_IAP_DISCLAIMER = "APP_CONTAINS_IAP_DISCLAIMER";
		field public static final String EXTRAINFO_APP_DEVELOPER_NAME = "APP_DEVELOPER_NAME";
		field public static final String EXTRAINFO_APP_DOMAIN_URL = "APP_DOMAIN_URL";
		field public static final String EXTRAINFO_APP_IARC = "APP_IARC";
		field public static final String EXTRAINFO_APP_ICON = "APP_ICON";
		field public static final String EXTRAINFO_APP_REVIEW_COUNT = "APP_REVIEW_COUNT";
		field public static final String EXTRAINFO_APP_SIZE_BYTES = "APP_SIZE_BYTES";
		field public static final String EXTRAINFO_APP_STAR_RATING = "APP_STAR_RATING";
		field public static final String EXTRAINFO_LONG_DESCRIPTION = "LONG_DESCRIPTION";
		field public static final String EXTRAINFO_SCREENSHOTS = "SCREENSHOTS";
		field public static final String EXTRAINFO_SHORT_DESCRIPTION = "SHORT_DESCRIPTION";
		field public static final String EXTRAINFO_WEB_ICON = "WEB_ICON";
		field public static final String EXTRAINFO_WEB_URL = "WEB_URL";
		field public static final String EXTRAINFO_ACTION_BUTTON_IMAGE_PREREGISTERING = "android.app.cloudsearch.ACTION_BUTTON_IMAGE";
		field public static final String EXTRAINFO_ACTION_BUTTON_TEXT_PREREGISTERING = "android.app.cloudsearch.ACTION_BUTTON_TEXT";
		field public static final String EXTRAINFO_APP_BADGES = "android.app.cloudsearch.APP_BADGES";
		field public static final String EXTRAINFO_APP_CONTAINS_ADS_DISCLAIMER = "android.app.cloudsearch.APP_CONTAINS_ADS_DISCLAIMER";
		field public static final String EXTRAINFO_APP_CONTAINS_IAP_DISCLAIMER = "android.app.cloudsearch.APP_CONTAINS_IAP_DISCLAIMER";
		field public static final String EXTRAINFO_APP_DEVELOPER_NAME = "android.app.cloudsearch.APP_DEVELOPER_NAME";
		field public static final String EXTRAINFO_APP_DOMAIN_URL = "android.app.cloudsearch.APP_DOMAIN_URL";
		field public static final String EXTRAINFO_APP_IARC = "android.app.cloudsearch.APP_IARC";
		field public static final String EXTRAINFO_APP_ICON = "android.app.cloudsearch.APP_ICON";
		field public static final String EXTRAINFO_APP_REVIEW_COUNT = "android.app.cloudsearch.APP_REVIEW_COUNT";
		field public static final String EXTRAINFO_APP_SIZE_BYTES = "android.app.cloudsearch.APP_SIZE_BYTES";
		field public static final String EXTRAINFO_APP_STAR_RATING = "android.app.cloudsearch.APP_STAR_RATING";
		field public static final String EXTRAINFO_LONG_DESCRIPTION = "android.app.cloudsearch.LONG_DESCRIPTION";
		field public static final String EXTRAINFO_SCREENSHOTS = "android.app.cloudsearch.SCREENSHOTS";
		field public static final String EXTRAINFO_SHORT_DESCRIPTION = "android.app.cloudsearch.SHORT_DESCRIPTION";
		field public static final String EXTRAINFO_WEB_ICON = "android.app.cloudsearch.WEB_ICON";
		field public static final String EXTRAINFO_WEB_URL = "android.app.cloudsearch.WEB_URL";
		}

		public static final class SearchResult.Builder {

core/java/android/app/cloudsearch/SearchRequest.java

+4 −2

Original line number	Diff line number	Diff line
		@@ -83,11 +83,13 @@ public final class SearchRequest implements Parcelable {
		* presubmit is the input before the user finishes the entire query, i.e. push "ENTER" or
		* "SEARCH" button. After the user finishes the entire query, the behavior is postsubmit.
		*/
		public static final String CONSTRAINT_IS_PRESUBMIT_SUGGESTION = "IS_PRESUBMIT_SUGGESTION";
		public static final String CONSTRAINT_IS_PRESUBMIT_SUGGESTION =
		"android.app.cloudsearch.IS_PRESUBMIT_SUGGESTION";
		/** The target search provider list of package names(separated by ;), String value expected.
		* If this is not provided or its value is empty, then no filter will be applied.
		*/
		public static final String CONSTRAINT_SEARCH_PROVIDER_FILTER = "SEARCH_PROVIDER_FILTER";
		public static final String CONSTRAINT_SEARCH_PROVIDER_FILTER =
		"android.app.cloudsearch.SEARCH_PROVIDER_FILTER";

		@NonNull
		private Bundle mSearchConstraints;

core/java/android/app/cloudsearch/SearchResult.java

+26 −19

Original line number	Diff line number	Diff line
		@@ -75,47 +75,54 @@ public final class SearchResult implements Parcelable {
		EXTRAINFO_WEB_ICON})
		public @interface SearchResultExtraInfoKey {}
		/** This App developer website's domain URL, String value expected. */
		public static final String EXTRAINFO_APP_DOMAIN_URL = "APP_DOMAIN_URL";
		public static final String EXTRAINFO_APP_DOMAIN_URL = "android.app.cloudsearch.APP_DOMAIN_URL";
		/** This App icon, android.graphics.drawable.Icon expected. */
		public static final String EXTRAINFO_APP_ICON = "APP_ICON";
		public static final String EXTRAINFO_APP_ICON = "android.app.cloudsearch.APP_ICON";
		/** This App developer's name, String value expected. */
		public static final String EXTRAINFO_APP_DEVELOPER_NAME = "APP_DEVELOPER_NAME";
		public static final String EXTRAINFO_APP_DEVELOPER_NAME =
		"android.app.cloudsearch.APP_DEVELOPER_NAME";
		/** This App's pkg size in bytes, Double value expected. */
		public static final String EXTRAINFO_APP_SIZE_BYTES = "APP_SIZE_BYTES";
		public static final String EXTRAINFO_APP_SIZE_BYTES = "android.app.cloudsearch.APP_SIZE_BYTES";
		/** This App developer's name, Double value expected. */
		public static final String EXTRAINFO_APP_STAR_RATING = "APP_STAR_RATING";
		public static final String EXTRAINFO_APP_STAR_RATING =
		"android.app.cloudsearch.APP_STAR_RATING";
		/** This App's IARC rating, String value expected.
		* IARC (International Age Rating Coalition) is partnered globally with major
		* content rating organizations to provide a centralized and one-stop-shop for
		* rating content on a global scale.
		*/
		public static final String EXTRAINFO_APP_IARC = "APP_IARC";
		public static final String EXTRAINFO_APP_IARC = "android.app.cloudsearch.APP_IARC";
		/** This App's review count, Double value expected. */
		public static final String EXTRAINFO_APP_REVIEW_COUNT = "APP_REVIEW_COUNT";
		public static final String EXTRAINFO_APP_REVIEW_COUNT =
		"android.app.cloudsearch.APP_REVIEW_COUNT";
		/** If this App contains the Ads Disclaimer, Boolean value expected. */
		public static final String EXTRAINFO_APP_CONTAINS_ADS_DISCLAIMER =
		"APP_CONTAINS_ADS_DISCLAIMER";
		"android.app.cloudsearch.APP_CONTAINS_ADS_DISCLAIMER";
		/** If this App contains the IAP Disclaimer, Boolean value expected. */
		public static final String EXTRAINFO_APP_CONTAINS_IAP_DISCLAIMER =
		"APP_CONTAINS_IAP_DISCLAIMER";
		"android.app.cloudsearch.APP_CONTAINS_IAP_DISCLAIMER";
		/** This App's short description, String value expected. */
		public static final String EXTRAINFO_SHORT_DESCRIPTION = "SHORT_DESCRIPTION";
		public static final String EXTRAINFO_SHORT_DESCRIPTION =
		"android.app.cloudsearch.SHORT_DESCRIPTION";
		/** This App's long description, String value expected. */
		public static final String EXTRAINFO_LONG_DESCRIPTION = "LONG_DESCRIPTION";
		/** This App's screenshots, List<ImageLoadingBundle> value expected. */
		public static final String EXTRAINFO_SCREENSHOTS = "SCREENSHOTS";
		/** Editor's choices for this App, ArrayList<String> value expected. */
		public static final String EXTRAINFO_APP_BADGES = "APP_BADGES";
		public static final String EXTRAINFO_LONG_DESCRIPTION =
		"android.app.cloudsearch.LONG_DESCRIPTION";
		/** This App's screenshots, {@code List<ImageLoadingBundle>} value expected. */
		public static final String EXTRAINFO_SCREENSHOTS = "android.app.cloudsearch.SCREENSHOTS";
		/** Editor's choices for this App, {@code ArrayList<String>} value expected. */
		public static final String EXTRAINFO_APP_BADGES = "android.app.cloudsearch.APP_BADGES";
		/** Pre-registration game's action button text, String value expected. */
		@SuppressLint("IntentName")
		public static final String EXTRAINFO_ACTION_BUTTON_TEXT_PREREGISTERING = "ACTION_BUTTON_TEXT";
		public static final String EXTRAINFO_ACTION_BUTTON_TEXT_PREREGISTERING =
		"android.app.cloudsearch.ACTION_BUTTON_TEXT";
		/** Pre-registration game's action button image, ImageLoadingBundle value expected. */
		@SuppressLint("IntentName")
		public static final String EXTRAINFO_ACTION_BUTTON_IMAGE_PREREGISTERING = "ACTION_BUTTON_IMAGE";
		public static final String EXTRAINFO_ACTION_BUTTON_IMAGE_PREREGISTERING =
		"android.app.cloudsearch.ACTION_BUTTON_IMAGE";
		/** Web content's URL, String value expected. */
		public static final String EXTRAINFO_WEB_URL = "WEB_URL";
		public static final String EXTRAINFO_WEB_URL = "android.app.cloudsearch.WEB_URL";
		/** Web content's domain icon, android.graphics.drawable.Icon expected. */
		public static final String EXTRAINFO_WEB_ICON = "WEB_ICON";
		public static final String EXTRAINFO_WEB_ICON = "android.app.cloudsearch.WEB_ICON";

		@NonNull
		private Bundle mExtraInfos;