am 03981a4c: Merge "Add activity attribute allowEmbedded" into klp-modular-dev (f8a58208) · Commits · e / os / android_frameworks_base

api/current.txt

+1 −0

Original line number	Diff line number	Diff line
		@@ -277,6 +277,7 @@ package android {
		field public static final int allContactsName = 16843468; // 0x10102cc
		field public static final int allowBackup = 16843392; // 0x1010280
		field public static final int allowClearUserData = 16842757; // 0x1010005
		field public static final int allowEmbedded = 16843765; // 0x10103f5
		field public static final int allowParallelSyncs = 16843570; // 0x1010332
		field public static final int allowSingleTap = 16843353; // 0x1010259
		field public static final int allowTaskReparenting = 16843268; // 0x1010204

+8 −1

Original line number	Diff line number	Diff line
		@@ -187,7 +187,7 @@ public class ActivityInfo extends ComponentInfo
		/**
		* @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
		* {@link android.R.attr#primaryUserOnly} attribute.
		* android.R.attr#primaryUserOnly attribute.
		*/
		public static final int FLAG_PRIMARY_USER_ONLY = 0x20000000;
		/**
		@@ -198,6 +198,13 @@ public class ActivityInfo extends ComponentInfo
		* components; it is not applied to activities.
		*/
		public static final int FLAG_SINGLE_USER = 0x40000000;
		/**
		* @hide Bit in {@link #flags}: If set, this activity may be launched into an
		* owned ActivityContainer such as that within an ActivityView. If not set and
		* this activity is launched into such a container a SecurityExcception will be
		* thrown. Set from the {@link android.R.attr#allowEmbedded} attribute.
		*/
		public static final int FLAG_ALLOW_EMBEDDED = 0x80000000;
		/**
		* Options that have been set in the activity declaration in the
		* manifest.

+6 −0

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

		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,

+9 −1

Original line number	Diff line number	Diff line
		@@ -736,6 +736,13 @@
		<flag name="fontScale" value="0x40000000" />
		</attr>

		<!-- Indicate that the activity can be launched as the embedded child of another
		activity. Particularly in the case where the child lives in a container
		such as a Display owned by another activity.

		<p>The default value of this attribute is <code>false</code>. -->
		<attr name="allowEmbedded" format="boolean" />

		<!-- Descriptive text for the associated data. -->
		<attr name="description" format="reference" />

		@@ -1516,6 +1523,7 @@
		<!-- @hide This broacast receiver will only receive broadcasts for the
		primary user. Can only be used with receivers. -->
		<attr name="primaryUserOnly" format="boolean" />
		<attr name="allowEmbedded" />
		</declare-styleable>

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

+2 −1

Original line number	Diff line number	Diff line
		@@ -2094,5 +2094,6 @@

		<public type="attr" name="banner" id="0x10103f2" />
		<public type="attr" name="windowSwipeToDismiss" id="0x10103f3" />
		<public type="attr" name="isGame" />
		<public type="attr" name="isGame" id="0x10103f4" />
		<public type="attr" name="allowEmbedded" id="0x10103f5" />
		</resources>