Merge "Add attributes and flags for DocCentric." (77f5a0f5) · Commits · e / os / android_frameworks_base

api/current.txt

+9 −0

Original line number	Diff line number	Diff line
		@@ -314,6 +314,7 @@ package android {
		field public static final int autoCompleteTextViewStyle = 16842859; // 0x101006b
		field public static final int autoLink = 16842928; // 0x10100b0
		field public static final int autoMirrored = 16843754; // 0x10103ea
		field public static final int autoRemoveFromRecents = 16843859; // 0x1010453
		field public static final int autoStart = 16843445; // 0x10102b5
		field public static final deprecated int autoText = 16843114; // 0x101016a
		field public static final int autoUrlDetect = 16843404; // 0x101028c
		@@ -463,6 +464,7 @@ package android {
		field public static final int dividerHorizontal = 16843564; // 0x101032c
		field public static final int dividerPadding = 16843562; // 0x101032a
		field public static final int dividerVertical = 16843530; // 0x101030a
		field public static final int documentLaunchMode = 16843858; // 0x1010452
		field public static final int drawSelectorOnTop = 16843004; // 0x10100fc
		field public static final int drawable = 16843161; // 0x1010199
		field public static final int drawableBottom = 16843118; // 0x101016e
		@@ -7152,6 +7154,7 @@ package android.content {
		field public static final int FILL_IN_PACKAGE = 16; // 0x10
		field public static final int FILL_IN_SELECTOR = 64; // 0x40
		field public static final int FILL_IN_SOURCE_BOUNDS = 32; // 0x20
		field public static final int FLAG_ACTIVITY_AUTO_REMOVE_FROM_RECENTS = 8192; // 0x2000
		field public static final int FLAG_ACTIVITY_BROUGHT_TO_FRONT = 4194304; // 0x400000
		field public static final int FLAG_ACTIVITY_CLEAR_TASK = 32768; // 0x8000
		field public static final int FLAG_ACTIVITY_CLEAR_TOP = 67108864; // 0x4000000
		@@ -7670,8 +7673,12 @@ package android.content.pm {
		field public static final int CONFIG_TOUCHSCREEN = 8; // 0x8
		field public static final int CONFIG_UI_MODE = 512; // 0x200
		field public static final android.os.Parcelable.Creator CREATOR;
		field public static final int DOCUMENT_LAUNCH_ALWAYS = 2; // 0x2
		field public static final int DOCUMENT_LAUNCH_INTO_EXISTING = 1; // 0x1
		field public static final int DOCUMENT_LAUNCH_NONE = 0; // 0x0
		field public static final int FLAG_ALLOW_TASK_REPARENTING = 64; // 0x40
		field public static final int FLAG_ALWAYS_RETAIN_TASK_STATE = 8; // 0x8
		field public static final int FLAG_AUTO_REMOVE_FROM_RECENTS = 8192; // 0x2000
		field public static final int FLAG_CLEAR_TASK_ON_LAUNCH = 4; // 0x4
		field public static final int FLAG_EXCLUDE_FROM_RECENTS = 32; // 0x20
		field public static final int FLAG_FINISH_ON_CLOSE_SYSTEM_DIALOGS = 256; // 0x100
		@@ -7680,6 +7687,7 @@ package android.content.pm {
		field public static final int FLAG_IMMERSIVE = 2048; // 0x800
		field public static final int FLAG_MULTIPROCESS = 1; // 0x1
		field public static final int FLAG_NO_HISTORY = 128; // 0x80
		field public static final int FLAG_PERSISTABLE = 4096; // 0x1000
		field public static final int FLAG_SINGLE_USER = 1073741824; // 0x40000000
		field public static final int FLAG_STATE_NOT_NEEDED = 16; // 0x10
		field public static final int LAUNCH_MULTIPLE = 0; // 0x0
		@@ -7704,6 +7712,7 @@ package android.content.pm {
		field public static final int SCREEN_ORIENTATION_USER_PORTRAIT = 12; // 0xc
		field public static final int UIOPTION_SPLIT_ACTION_BAR_WHEN_NARROW = 1; // 0x1
		field public int configChanges;
		field public int documentLaunchMode;
		field public int flags;
		field public int launchMode;
		field public java.lang.String parentActivityName;

core/java/android/content/Intent.java

+14 −2

Original line number	Diff line number	Diff line
		@@ -3736,7 +3736,8 @@ public class Intent implements Parcelable, Cloneable {
		*
		* <p>When set, the activity specified by this Intent will launch into a
		* separate task rooted at that activity. The activity launched must be
		* defined with {@link android.R.attr#launchMode} "standard" or "singleTop".
		* defined with {@link android.R.attr#launchMode} <code>standard</code>
		* or <code>singleTop</code>.
		*
		* <p>If FLAG_ACTIVITY_NEW_DOCUMENT is used without
		* {@link #FLAG_ACTIVITY_MULTIPLE_TASK} then the activity manager will
		@@ -3751,6 +3752,8 @@ public class Intent implements Parcelable, Cloneable {
		* always create a new task. Thus the same document may be made to appear
		* more than one time in Recents.
		*
		* <p>This is equivalent to the attribute {@link android.R.attr#documentLaunchMode}.
		*
		* @see #FLAG_ACTIVITY_MULTIPLE_TASK
		*/
		public static final int FLAG_ACTIVITY_NEW_DOCUMENT =
		@@ -3814,6 +3817,15 @@ public class Intent implements Parcelable, Cloneable {
		* saw. This can only be used in conjunction with {@link #FLAG_ACTIVITY_NEW_TASK}.
		*/
		public static final int FLAG_ACTIVITY_TASK_ON_HOME = 0X00004000;
		/**
		* If set and the new activity is the root of a new task, then the task
		* will remain in the list of recently launched tasks only until all of
		* the activities in it are finished.
		*
		* <p>This is equivalent to the attribute
		* {@link android.R.styleable#AndroidManifestActivity_autoRemoveFromRecents}.
		*/
		public static final int FLAG_ACTIVITY_AUTO_REMOVE_FROM_RECENTS = 0x00002000;
		/**
		* If set, when sending a broadcast only registered receivers will be
		* called -- no BroadcastReceiver components will be launched.
		@@ -4019,7 +4031,7 @@ public class Intent implements Parcelable, Cloneable {

		/**
		* Create an intent for a specific component with a specified action and data.
		* This is equivalent using {@link #Intent(String, android.net.Uri)} to
		* This is equivalent to using {@link #Intent(String, android.net.Uri)} to
		* construct the Intent and then calling {@link #setClass} to set its
		* class.
		*

core/java/android/content/pm/ActivityInfo.java

+37 −2

Original line number	Diff line number	Diff line
		@@ -68,6 +68,36 @@ public class ActivityInfo extends ComponentInfo
		*/
		public int launchMode;

		/**
		* Constant corresponding to <code>none</code> in
		* the {@link android.R.attr#documentLaunchMode} attribute.
		*/
		public static final int DOCUMENT_LAUNCH_NONE = 0;
		/**
		* Constant corresponding to <code>intoExisting</code> in
		* the {@link android.R.attr#documentLaunchMode} attribute.
		*/
		public static final int DOCUMENT_LAUNCH_INTO_EXISTING = 1;
		/**
		* Constant corresponding to <code>always</code> in
		* the {@link android.R.attr#documentLaunchMode} attribute.
		*/
		public static final int DOCUMENT_LAUNCH_ALWAYS = 2;
		/**
		* The document launch mode style requested by the activity. From the
		* {@link android.R.attr#documentLaunchMode} attribute, one of
		* {@link #DOCUMENT_LAUNCH_NONE}, {@link #DOCUMENT_LAUNCH_INTO_EXISTING},
		* {@link #DOCUMENT_LAUNCH_ALWAYS}.
		*
		* <p>Modes DOCUMENT_LAUNCH_ALWAYS
		* and DOCUMENT_LAUNCH_INTO_EXISTING are equivalent to {@link
		* android.content.Intent#FLAG_ACTIVITY_NEW_DOCUMENT
		* Intent.FLAG_ACTIVITY_NEW_DOCUMENT} with and without {@link
		* android.content.Intent#FLAG_ACTIVITY_MULTIPLE_TASK
		* Intent.FLAG_ACTIVITY_MULTIPLE_TASK} respectively.
		*/
		public int documentLaunchMode;

		/**
		* Optional name of a permission required to be able to access this
		* Activity. From the "permission" attribute.
		@@ -192,9 +222,14 @@ public class ActivityInfo extends ComponentInfo
		* Bit in {@link #flags} indicating that this activity is to be persisted across
		* reboots for display in the Recents list.
		* {@link android.R.attr#persistable}
		* @hide
		*/
		public static final int FLAG_PERSISTABLE = 0x1000;
		/**
		* Bit in {@link #flags} indicating that tasks started with this activity are to be
		* removed from the recent list of tasks when the last activity in the task is finished.
		* {@link android.R.attr#autoRemoveFromRecents}
		*/
		public static final int FLAG_AUTO_REMOVE_FROM_RECENTS = 0x2000;
		/**
		* @hide Bit in {@link #flags}: If set, this component will only be seen
		* by the primary user. Only works with broadcast receivers. Set from the

core/java/android/content/pm/PackageParser.java

+20 −11

Original line number	Diff line number	Diff line
		@@ -2462,17 +2462,6 @@ public class PackageParser {
		a.info.flags \|= ActivityInfo.FLAG_IMMERSIVE;
		}

		if (sa.getBoolean(
		com.android.internal.R.styleable.AndroidManifestActivity_persistable, false)) {
		a.info.flags \|= ActivityInfo.FLAG_PERSISTABLE;
		}

		if (sa.getBoolean(
		com.android.internal.R.styleable.AndroidManifestActivity_allowEmbedded,
		false)) {
		a.info.flags \|= ActivityInfo.FLAG_ALLOW_EMBEDDED;
		}

		if (!receiver) {
		if (sa.getBoolean(
		com.android.internal.R.styleable.AndroidManifestActivity_hardwareAccelerated,
		@@ -2483,6 +2472,9 @@ public class PackageParser {
		a.info.launchMode = sa.getInt(
		com.android.internal.R.styleable.AndroidManifestActivity_launchMode,
		ActivityInfo.LAUNCH_MULTIPLE);
		a.info.documentLaunchMode = sa.getInt(
		com.android.internal.R.styleable.AndroidManifestActivity_documentLaunchMode,
		ActivityInfo.DOCUMENT_LAUNCH_NONE);
		a.info.screenOrientation = sa.getInt(
		com.android.internal.R.styleable.AndroidManifestActivity_screenOrientation,
		ActivityInfo.SCREEN_ORIENTATION_UNSPECIFIED);
		@@ -2492,6 +2484,23 @@ public class PackageParser {
		a.info.softInputMode = sa.getInt(
		com.android.internal.R.styleable.AndroidManifestActivity_windowSoftInputMode,
		0);

		if (sa.getBoolean(
		com.android.internal.R.styleable.AndroidManifestActivity_persistable, false)) {
		a.info.flags \|= ActivityInfo.FLAG_PERSISTABLE;
		}

		if (sa.getBoolean(
		com.android.internal.R.styleable.AndroidManifestActivity_allowEmbedded,
		false)) {
		a.info.flags \|= ActivityInfo.FLAG_ALLOW_EMBEDDED;
		}

		if (sa.getBoolean(
		com.android.internal.R.styleable.AndroidManifestActivity_autoRemoveFromRecents,
		false)) {
		a.info.flags \|= ActivityInfo.FLAG_AUTO_REMOVE_FROM_RECENTS;
		}
		} else {
		a.info.launchMode = ActivityInfo.LAUNCH_MULTIPLE;
		a.info.configChanges = 0;

core/res/res/values/attrs_manifest.xml

+43 −0

Original line number	Diff line number	Diff line
		@@ -885,6 +885,47 @@
		be passed a persistable Bundle in their Intent.extras. -->
		<attr name="persistable" format="boolean" />

		<!-- Specify whether this activity should always be launched in doc-centric mode. For
		values other than <code>none</code> the activity must be defined with
		{@link android.R.attr#launchMode} <code>standard</code> or <code>singleTop</code>.
		This attribute can be overridden by {@link
		android.content.Intent#FLAG_ACTIVITY_NEW_DOCUMENT}.

		<p>If this attribute is not specified, <code>none</code> will be used.
		Note that this launch behavior can be changed in some ways at runtime
		through the {@link android.content.Intent} flags
		{@link android.content.Intent#FLAG_ACTIVITY_NEW_DOCUMENT}. -->
		<attr name="documentLaunchMode">
		<!-- The default mode, which will create a new task only when
		{@link android.content.Intent#FLAG_ACTIVITY_NEW_TASK
		Intent.FLAG_ACTIVITY_NEW_TASK} is set. -->
		<enum name="none" value="0" />
		<!-- All tasks will be searched for a matching Intent. If one is found
		That task will cleared and restarted with the root activity receiving a call
		to {@link android.app.Activity#onNewIntent Activity.onNewIntent}. If no
		such task is found a new task will be created.
		This is the equivalent of with {@link
		android.content.Intent#FLAG_ACTIVITY_NEW_DOCUMENT Intent.FLAG_ACTIVITY_NEW_DOCUMENT}
		without {@link android.content.Intent#FLAG_ACTIVITY_MULTIPLE_TASK
		Intent.FLAG_ACTIVITY_MULTIPLE_TASK}. -->
		<enum name="intoExisting" value="1" />
		<!-- A new task rooted at this activity will be created.
		This is the equivalent of with {@link
		android.content.Intent#FLAG_ACTIVITY_NEW_DOCUMENT Intent.FLAG_ACTIVITY_NEW_DOCUMENT}
		paired with {@link android.content.Intent#FLAG_ACTIVITY_MULTIPLE_TASK
		Intent.FLAG_ACTIVITY_MULTIPLE_TASK}. -->
		<enum name="always" value="2" />
		</attr>

		<!-- Tasks launched by activities with this attribute will remain in the recent task
		list until the last activity in the task is completed. When that happens the task
		will be automatically removed from the recent task list.

		This attribute is the equivalent of {@link
		android.content.Intent#FLAG_ACTIVITY_AUTO_REMOVE_FROM_RECENTS
		Intent.FLAG_ACTIVITY_AUTO_REMOVE_FROM_RECENTS} -->
		<attr name="autoRemoveFromRecents" format="boolean" />

		<!-- The <code>manifest</code> tag is the root of an
		<code>AndroidManifest.xml</code> file,
		describing the contents of an Android package (.apk) file. One
		@@ -1549,6 +1590,8 @@
		<attr name="primaryUserOnly" format="boolean" />
		<attr name="persistable" />
		<attr name="allowEmbedded" />
		<attr name="documentLaunchMode" />
		<attr name="autoRemoveFromRecents" />
		</declare-styleable>

		<!-- The <code>activity-alias</code> tag declares a new