Merge "Make ACTION_QUICK_VIEW public." (c46d8911) · Commits · e / os / android_frameworks_base

api/current.txt

+2 −0

Original line number	Diff line number	Diff line
		@@ -8463,6 +8463,7 @@ package android.content {
		field public static final java.lang.String ACTION_PROCESS_TEXT = "android.intent.action.PROCESS_TEXT";
		field public static final java.lang.String ACTION_PROVIDER_CHANGED = "android.intent.action.PROVIDER_CHANGED";
		field public static final java.lang.String ACTION_QUICK_CLOCK = "android.intent.action.QUICK_CLOCK";
		field public static final java.lang.String ACTION_QUICK_VIEW = "android.intent.action.QUICK_VIEW";
		field public static final java.lang.String ACTION_REBOOT = "android.intent.action.REBOOT";
		field public static final java.lang.String ACTION_RUN = "android.intent.action.RUN";
		field public static final java.lang.String ACTION_SCREEN_OFF = "android.intent.action.SCREEN_OFF";
		@@ -8556,6 +8557,7 @@ package android.content {
		field public static final java.lang.String EXTRA_DONT_KILL_APP = "android.intent.extra.DONT_KILL_APP";
		field public static final java.lang.String EXTRA_EMAIL = "android.intent.extra.EMAIL";
		field public static final java.lang.String EXTRA_HTML_TEXT = "android.intent.extra.HTML_TEXT";
		field public static final java.lang.String EXTRA_INDEX = "android.intent.extra.INDEX";
		field public static final java.lang.String EXTRA_INITIAL_INTENTS = "android.intent.extra.INITIAL_INTENTS";
		field public static final java.lang.String EXTRA_INSTALLER_PACKAGE_NAME = "android.intent.extra.INSTALLER_PACKAGE_NAME";
		field public static final java.lang.String EXTRA_INTENT = "android.intent.extra.INTENT";

api/system-current.txt

+2 −0

Original line number	Diff line number	Diff line
		@@ -8765,6 +8765,7 @@ package android.content {
		field public static final java.lang.String ACTION_PROVIDER_CHANGED = "android.intent.action.PROVIDER_CHANGED";
		field public static final java.lang.String ACTION_QUERY_PACKAGE_RESTART = "android.intent.action.QUERY_PACKAGE_RESTART";
		field public static final java.lang.String ACTION_QUICK_CLOCK = "android.intent.action.QUICK_CLOCK";
		field public static final java.lang.String ACTION_QUICK_VIEW = "android.intent.action.QUICK_VIEW";
		field public static final java.lang.String ACTION_REBOOT = "android.intent.action.REBOOT";
		field public static final java.lang.String ACTION_RESOLVE_EPHEMERAL_PACKAGE = "android.intent.action.RESOLVE_EPHEMERAL_PACKAGE";
		field public static final java.lang.String ACTION_RUN = "android.intent.action.RUN";
		@@ -8862,6 +8863,7 @@ package android.content {
		field public static final java.lang.String EXTRA_EPHEMERAL_FAILURE = "android.intent.extra.EPHEMERAL_FAILURE";
		field public static final java.lang.String EXTRA_EPHEMERAL_SUCCESS = "android.intent.extra.EPHEMERAL_SUCCESS";
		field public static final java.lang.String EXTRA_HTML_TEXT = "android.intent.extra.HTML_TEXT";
		field public static final java.lang.String EXTRA_INDEX = "android.intent.extra.INDEX";
		field public static final java.lang.String EXTRA_INITIAL_INTENTS = "android.intent.extra.INITIAL_INTENTS";
		field public static final java.lang.String EXTRA_INSTALLER_PACKAGE_NAME = "android.intent.extra.INSTALLER_PACKAGE_NAME";
		field public static final java.lang.String EXTRA_INTENT = "android.intent.extra.INTENT";

api/test-current.txt

+2 −0

Original line number	Diff line number	Diff line
		@@ -8468,6 +8468,7 @@ package android.content {
		field public static final java.lang.String ACTION_PROCESS_TEXT = "android.intent.action.PROCESS_TEXT";
		field public static final java.lang.String ACTION_PROVIDER_CHANGED = "android.intent.action.PROVIDER_CHANGED";
		field public static final java.lang.String ACTION_QUICK_CLOCK = "android.intent.action.QUICK_CLOCK";
		field public static final java.lang.String ACTION_QUICK_VIEW = "android.intent.action.QUICK_VIEW";
		field public static final java.lang.String ACTION_REBOOT = "android.intent.action.REBOOT";
		field public static final java.lang.String ACTION_RUN = "android.intent.action.RUN";
		field public static final java.lang.String ACTION_SCREEN_OFF = "android.intent.action.SCREEN_OFF";
		@@ -8561,6 +8562,7 @@ package android.content {
		field public static final java.lang.String EXTRA_DONT_KILL_APP = "android.intent.extra.DONT_KILL_APP";
		field public static final java.lang.String EXTRA_EMAIL = "android.intent.extra.EMAIL";
		field public static final java.lang.String EXTRA_HTML_TEXT = "android.intent.extra.HTML_TEXT";
		field public static final java.lang.String EXTRA_INDEX = "android.intent.extra.INDEX";
		field public static final java.lang.String EXTRA_INITIAL_INTENTS = "android.intent.extra.INITIAL_INTENTS";
		field public static final java.lang.String EXTRA_INSTALLER_PACKAGE_NAME = "android.intent.extra.INSTALLER_PACKAGE_NAME";
		field public static final java.lang.String EXTRA_INTENT = "android.intent.extra.INTENT";

core/java/android/content/Intent.java

+10 −4

Original line number	Diff line number	Diff line
		@@ -664,10 +664,13 @@ public class Intent implements Parcelable, Cloneable {
		public static final String ACTION_DEFAULT = ACTION_VIEW;

		/**
		* Activity Action: Quick view the data.
		* <p>Input: {@link #getData} is URI from which to retrieve data.
		* Activity Action: Quick view the data. Launches a quick viewer for
		* a URI or a list of URIs.
		* <p>Input: {@link #getData} is a mandatory content URI of the item to
		* preview. {@link #getClipData} contains an optional list of content URIs
		* if there is more than one item to preview. {@link #EXTRA_INDEX} is an
		* optional index of the URI in the clip data to show first.
		* <p>Output: nothing.
		* @hide
		*/
		@SdkConstant(SdkConstantType.ACTIVITY_INTENT_ACTION)
		public static final String ACTION_QUICK_VIEW = "android.intent.action.QUICK_VIEW";
		@@ -4159,7 +4162,10 @@ public class Intent implements Parcelable, Cloneable {
		public static final String EXTRA_SIM_ACTIVATION_RESPONSE =
		"android.intent.extra.SIM_ACTIVATION_RESPONSE";

		/** {@hide} */
		/**
		* Optional index with semantics depending on the intent action.
		* @see #ACTION_QUICK_VIEW
		*/
		public static final String EXTRA_INDEX = "android.intent.extra.INDEX";

		/**