Merge change 7934 into donut (890231f1) · Commits · e / os / android_frameworks_base

api/current.xml

+88 −0

Original line number	Diff line number	Diff line
		@@ -23732,6 +23732,28 @@
		visibility="public"
		>
		</field>
		<field name="EXTRA_DATA_KEY"
		type="java.lang.String"
		transient="false"
		volatile="false"
		value=""intent_extra_data_key""
		static="true"
		final="true"
		deprecated="not deprecated"
		visibility="public"
		>
		</field>
		<field name="INTENT_ACTION_WEB_SEARCH_SETTINGS"
		type="java.lang.String"
		transient="false"
		volatile="false"
		value=""android.search.action.WEB_SEARCH_SETTINGS""
		static="true"
		final="true"
		deprecated="not deprecated"
		visibility="public"
		>
		</field>
		<field name="MENU_KEY"
		type="char"
		transient="false"
		@@ -23765,6 +23787,17 @@
		visibility="public"
		>
		</field>
		<field name="SHORTCUT_MIME_TYPE"
		type="java.lang.String"
		transient="false"
		volatile="false"
		value=""vnd.android.cursor.item/vnd.android.search.suggest""
		static="true"
		final="true"
		deprecated="not deprecated"
		visibility="public"
		>
		</field>
		<field name="SUGGEST_COLUMN_FORMAT"
		type="java.lang.String"
		transient="false"
		@@ -23831,6 +23864,17 @@
		visibility="public"
		>
		</field>
		<field name="SUGGEST_COLUMN_INTENT_EXTRA_DATA"
		type="java.lang.String"
		transient="false"
		volatile="false"
		value=""suggest_intent_extra_data""
		static="true"
		final="true"
		deprecated="not deprecated"
		visibility="public"
		>
		</field>
		<field name="SUGGEST_COLUMN_QUERY"
		type="java.lang.String"
		transient="false"
		@@ -23842,6 +23886,28 @@
		visibility="public"
		>
		</field>
		<field name="SUGGEST_COLUMN_SHORTCUT_ID"
		type="java.lang.String"
		transient="false"
		volatile="false"
		value=""suggest_shortcut_id""
		static="true"
		final="true"
		deprecated="not deprecated"
		visibility="public"
		>
		</field>
		<field name="SUGGEST_COLUMN_SPINNER_WHILE_REFRESHING"
		type="java.lang.String"
		transient="false"
		volatile="false"
		value=""suggest_spinner_while_refreshing""
		static="true"
		final="true"
		deprecated="not deprecated"
		visibility="public"
		>
		</field>
		<field name="SUGGEST_COLUMN_TEXT_1"
		type="java.lang.String"
		transient="false"
		@@ -23875,6 +23941,17 @@
		visibility="public"
		>
		</field>
		<field name="SUGGEST_NEVER_MAKE_SHORTCUT"
		type="java.lang.String"
		transient="false"
		volatile="false"
		value=""_-1""
		static="true"
		final="true"
		deprecated="not deprecated"
		visibility="public"
		>
		</field>
		<field name="SUGGEST_URI_PATH_QUERY"
		type="java.lang.String"
		transient="false"
		@@ -23886,6 +23963,17 @@
		visibility="public"
		>
		</field>
		<field name="SUGGEST_URI_PATH_SHORTCUT"
		type="java.lang.String"
		transient="false"
		volatile="false"
		value=""search_suggest_shortcut""
		static="true"
		final="true"
		deprecated="not deprecated"
		visibility="public"
		>
		</field>
		<field name="USER_QUERY"
		type="java.lang.String"
		transient="false"

core/java/android/app/SearchManager.java

+1 −17

Original line number	Diff line number	Diff line
		@@ -1188,8 +1188,6 @@ public class SearchManager
		/**
		* Intent extra data key: This key will be used for the extra populated by the
		* {@link #SUGGEST_COLUMN_INTENT_EXTRA_DATA} column.
		*
		* {@hide}
		*/
		public final static String EXTRA_DATA_KEY = "intent_extra_data_key";

		@@ -1269,16 +1267,12 @@ public class SearchManager
		* result indicates the shortcut refers to a no longer valid sugggestion.
		*
		* @see #SUGGEST_COLUMN_SHORTCUT_ID
		*
		* @hide pending API council approval
		*/
		public final static String SUGGEST_URI_PATH_SHORTCUT = "search_suggest_shortcut";

		/**
		* MIME type for shortcut validation. You'll use this in your suggestions content provider
		* in the getType() function.
		*
		* @hide pending API council approval
		*/
		public final static String SHORTCUT_MIME_TYPE =
		"vnd.android.cursor.item/vnd.android.search.suggest";
		@@ -1389,9 +1383,7 @@ public class SearchManager
		* this element exists at the given row, this is the data that will be used when
		* forming the suggestion's intent. If not provided, the Intent's extra data field will be null.
		* This column allows suggestions to provide additional arbitrary data which will be included as
		* an extra under the key EXTRA_DATA_KEY.
		*
		* @hide Pending API council approval.
		* an extra under the key {@link #EXTRA_DATA_KEY}.
		*/
		public final static String SUGGEST_COLUMN_INTENT_EXTRA_DATA = "suggest_intent_extra_data";
		/**
		@@ -1425,8 +1417,6 @@ public class SearchManager
		* {@link #SUGGEST_NEVER_MAKE_SHORTCUT}, the result will not be stored as a shortcut.
		* Otherwise, the shortcut id will be used to check back for validation via
		* {@link #SUGGEST_URI_PATH_SHORTCUT}.
		*
		* @hide Pending API council approval.
		*/
		public final static String SUGGEST_COLUMN_SHORTCUT_ID = "suggest_shortcut_id";

		@@ -1443,8 +1433,6 @@ public class SearchManager
		* Column name for suggestions cursor. <i>Optional.</i> This column is used to specify
		* that a spinner should be shown in lieu of an icon2 while the shortcut of this suggestion
		* is being refreshed.
		*
		* @hide Pending API council approval.
		*/
		public final static String SUGGEST_COLUMN_SPINNER_WHILE_REFRESHING =
		"suggest_spinner_while_refreshing";
		@@ -1452,8 +1440,6 @@ public class SearchManager
		/**
		* Column value for suggestion column {@link #SUGGEST_COLUMN_SHORTCUT_ID} when a suggestion
		* should not be stored as a shortcut in global search.
		*
		* @hide Pending API council approval.
		*/
		public final static String SUGGEST_NEVER_MAKE_SHORTCUT = "_-1";

		@@ -1500,8 +1486,6 @@ public class SearchManager
		* Intent action for starting a web search provider's settings activity.
		* Web search providers should handle this intent if they have provider-specific
		* settings to implement.
		*
		* @hide Pending API council approval.
		*/
		public final static String INTENT_ACTION_WEB_SEARCH_SETTINGS
		= "android.search.action.WEB_SEARCH_SETTINGS";