Support for activity to opt-in/out of PiP form of multi-window. (b60692e3) · Commits · e / os / android_frameworks_base

api/current.txt

+13 −12

api/system-current.txt

+13 −12

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

+12 −2

Original line number	Original line	Diff line number	Diff line
	@@ -671,6 +671,13 @@ public class ActivityInfo extends ComponentInfo
	*/		*/
	public boolean resizeable;		public boolean resizeable;

			/**
			* Value indicating if the activity is supports picture-in-picture form of multi-window mode.
			* See {@link android.R.attr#supportsPictureInPicture}.
			* @hide
			*/
			public boolean supportsPip;

	/** @hide */		/** @hide */
	public static final int LOCK_TASK_LAUNCH_MODE_DEFAULT = 0;		public static final int LOCK_TASK_LAUNCH_MODE_DEFAULT = 0;
	/** @hide */		/** @hide */
	@@ -723,6 +730,7 @@ public class ActivityInfo extends ComponentInfo
	parentActivityName = orig.parentActivityName;		parentActivityName = orig.parentActivityName;
	maxRecents = orig.maxRecents;		maxRecents = orig.maxRecents;
	resizeable = orig.resizeable;		resizeable = orig.resizeable;
			supportsPip = orig.supportsPip;
	lockTaskLaunchMode = orig.lockTaskLaunchMode;		lockTaskLaunchMode = orig.lockTaskLaunchMode;
	layout = orig.layout;		layout = orig.layout;
	}		}
	@@ -769,8 +777,8 @@ public class ActivityInfo extends ComponentInfo
	if (uiOptions != 0) {		if (uiOptions != 0) {
	pw.println(prefix + " uiOptions=0x" + Integer.toHexString(uiOptions));		pw.println(prefix + " uiOptions=0x" + Integer.toHexString(uiOptions));
	}		}
	pw.println(prefix + "resizeable=" + resizeable + " lockTaskLaunchMode="		pw.println(prefix + "resizeable=" + resizeable + " supportsPip=" + supportsPip);
	+ lockTaskLaunchModeToString(lockTaskLaunchMode));		pw.println(prefix + "lockTaskLaunchMode=" + lockTaskLaunchModeToString(lockTaskLaunchMode));
	if (layout != null) {		if (layout != null) {
	pw.println(prefix + "initialLayout=" + layout.width + "\|"		pw.println(prefix + "initialLayout=" + layout.width + "\|"
	+ layout.widthFraction + ", " + layout.height + "\|"		+ layout.widthFraction + ", " + layout.height + "\|"
	@@ -806,6 +814,7 @@ public class ActivityInfo extends ComponentInfo
	dest.writeInt(persistableMode);		dest.writeInt(persistableMode);
	dest.writeInt(maxRecents);		dest.writeInt(maxRecents);
	dest.writeInt(resizeable ? 1 : 0);		dest.writeInt(resizeable ? 1 : 0);
			dest.writeInt(supportsPip ? 1 : 0);
	dest.writeInt(lockTaskLaunchMode);		dest.writeInt(lockTaskLaunchMode);
	if (layout != null) {		if (layout != null) {
	dest.writeInt(1);		dest.writeInt(1);
	@@ -847,6 +856,7 @@ public class ActivityInfo extends ComponentInfo
	persistableMode = source.readInt();		persistableMode = source.readInt();
	maxRecents = source.readInt();		maxRecents = source.readInt();
	resizeable = (source.readInt() == 1);		resizeable = (source.readInt() == 1);
			supportsPip = (source.readInt() == 1);
	lockTaskLaunchMode = source.readInt();		lockTaskLaunchMode = source.readInt();
	if (source.readInt() == 1) {		if (source.readInt() == 1) {
	layout = new Layout(source);		layout = new Layout(source);

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

+3 −0

Original line number	Original line	Diff line number	Diff line
	@@ -3220,6 +3220,9 @@ public class PackageParser {
	R.styleable.AndroidManifestActivity_resizeableActivity,		R.styleable.AndroidManifestActivity_resizeableActivity,
	owner.applicationInfo.targetSdkVersion >= Build.VERSION_CODES.N);		owner.applicationInfo.targetSdkVersion >= Build.VERSION_CODES.N);

			a.info.supportsPip = a.info.resizeable ? sa.getBoolean(
			R.styleable.AndroidManifestActivity_supportsPictureInPicture, false) : false;

	a.info.screenOrientation = sa.getInt(		a.info.screenOrientation = sa.getInt(
	R.styleable.AndroidManifestActivity_screenOrientation,		R.styleable.AndroidManifestActivity_screenOrientation,
	ActivityInfo.SCREEN_ORIENTATION_UNSPECIFIED);		ActivityInfo.SCREEN_ORIENTATION_UNSPECIFIED);

core/res/res/values/attrs_manifest.xml

+18 −4

Original line number	Original line	Diff line number	Diff line
	@@ -1059,7 +1059,7 @@
	at the same time.		at the same time.

	<p>The default value is <code>false</code> for applications with		<p>The default value is <code>false</code> for applications with
	<code>targetSdkVersion</code> lesser than {@link android.os.Build.VERSION_CODES#M} and		<code>targetSdkVersion</code> lesser than {@link android.os.Build.VERSION_CODES#N} and
	<code>true</code> otherwise.		<code>true</code> otherwise.

	<p>NOTE: A task's root activity value is applied to all additional activities launched in		<p>NOTE: A task's root activity value is applied to all additional activities launched in
	@@ -1067,11 +1067,24 @@
	all other activities in the task as resizeable and will not if the root activity isn't		all other activities in the task as resizeable and will not if the root activity isn't
	resizeable.		resizeable.

	<p>NOTE: The value of {@link android.R.attr#screenOrientation} will be ignored for		<p>NOTE: The value of {@link android.R.attr#screenOrientation} is ignored for
	resizeable activities as the system doesn't support fixed orientation on a resizeable		resizeable activities when in multi-window mode. -->
	activity. -->
	<attr name="resizeableActivity" format="boolean" />		<attr name="resizeableActivity" format="boolean" />

			<!-- Indicates that the activity supports the picture-in-picture (PiP) form of multi-window.
			While it makes sense to be able to resize most activities types in multi-window mode when
			{@link android.R.attr#resizeableActivity} is set. It only makes sense to put specific types
			of activities in PiP mode of multi-window. For example, activities that play video. When
			set the activity will be allowed to enter PiP mode when the system deems it appropriate on
			devices that support PiP.

			<p>The default value is <code>false</code> for applications with
			<code>targetSdkVersion</code> lesser than {@link android.os.Build.VERSION_CODES#N} and
			<code>true</code> otherwise.

			<p>NOTE: Attribute is only used if {@link android.R.attr#resizeableActivity} is true. -->
			<attr name="supportsPictureInPicture" format="boolean" />

	<!-- This value indicates how tasks rooted at this activity will behave in lockTask mode.		<!-- This value indicates how tasks rooted at this activity will behave in lockTask mode.
	While in lockTask mode the system will not launch non-permitted tasks until		While in lockTask mode the system will not launch non-permitted tasks until
	lockTask mode is disabled.		lockTask mode is disabled.
	@@ -1826,6 +1839,7 @@
	<attr name="relinquishTaskIdentity" />		<attr name="relinquishTaskIdentity" />
	<attr name="resumeWhilePausing" />		<attr name="resumeWhilePausing" />
	<attr name="resizeableActivity" />		<attr name="resizeableActivity" />
			<attr name="supportsPictureInPicture" />
	<attr name="lockTaskMode" />		<attr name="lockTaskMode" />
	<attr name="showForAllUsers" />		<attr name="showForAllUsers" />
	</declare-styleable>		</declare-styleable>

Original line number	Original line	Diff line number	Diff line
	@@ -321,7 +321,7 @@ package android {
	field public static final int buttonBarNeutralButtonStyle = 16843914; // 0x101048a		field public static final int buttonBarNeutralButtonStyle = 16843914; // 0x101048a
	field public static final int buttonBarPositiveButtonStyle = 16843913; // 0x1010489		field public static final int buttonBarPositiveButtonStyle = 16843913; // 0x1010489
	field public static final int buttonBarStyle = 16843566; // 0x101032e		field public static final int buttonBarStyle = 16843566; // 0x101032e
	field public static final int buttonGravity = 16844030; // 0x10104fe		field public static final int buttonGravity = 16844031; // 0x10104ff
	field public static final int buttonStyle = 16842824; // 0x1010048		field public static final int buttonStyle = 16842824; // 0x1010048
	field public static final int buttonStyleInset = 16842826; // 0x101004a		field public static final int buttonStyleInset = 16842826; // 0x101004a
	field public static final int buttonStyleSmall = 16842825; // 0x1010049		field public static final int buttonStyleSmall = 16842825; // 0x1010049
	@@ -371,7 +371,7 @@ package android {
	field public static final int codes = 16843330; // 0x1010242		field public static final int codes = 16843330; // 0x1010242
	field public static final int collapseColumns = 16843083; // 0x101014b		field public static final int collapseColumns = 16843083; // 0x101014b
	field public static final int collapseContentDescription = 16843984; // 0x10104d0		field public static final int collapseContentDescription = 16843984; // 0x10104d0
	field public static final int collapseIcon = 16844031; // 0x10104ff		field public static final int collapseIcon = 16844032; // 0x1010500
	field public static final int color = 16843173; // 0x10101a5		field public static final int color = 16843173; // 0x10101a5
	field public static final int colorAccent = 16843829; // 0x1010435		field public static final int colorAccent = 16843829; // 0x1010435
	field public static final int colorActivatedHighlight = 16843664; // 0x1010390		field public static final int colorActivatedHighlight = 16843664; // 0x1010390
	@@ -412,7 +412,7 @@ package android {
	field public static final int contentInsetRight = 16843862; // 0x1010456		field public static final int contentInsetRight = 16843862; // 0x1010456
	field public static final int contentInsetStart = 16843859; // 0x1010453		field public static final int contentInsetStart = 16843859; // 0x1010453
	field public static final int contextClickable = 16844007; // 0x10104e7		field public static final int contextClickable = 16844007; // 0x10104e7
	field public static final int contextPopupMenuStyle = 16844033; // 0x1010501		field public static final int contextPopupMenuStyle = 16844034; // 0x1010502
	field public static final int controlX1 = 16843772; // 0x10103fc		field public static final int controlX1 = 16843772; // 0x10103fc
	field public static final int controlX2 = 16843774; // 0x10103fe		field public static final int controlX2 = 16843774; // 0x10103fe
	field public static final int controlY1 = 16843773; // 0x10103fd		field public static final int controlY1 = 16843773; // 0x10103fd
	@@ -780,7 +780,7 @@ package android {
	field public static final int layout_y = 16843136; // 0x1010180		field public static final int layout_y = 16843136; // 0x1010180
	field public static final int left = 16843181; // 0x10101ad		field public static final int left = 16843181; // 0x10101ad
	field public static final int letterSpacing = 16843958; // 0x10104b6		field public static final int letterSpacing = 16843958; // 0x10104b6
	field public static final int level = 16844032; // 0x1010500		field public static final int level = 16844033; // 0x1010501
	field public static final int lineSpacingExtra = 16843287; // 0x1010217		field public static final int lineSpacingExtra = 16843287; // 0x1010217
	field public static final int lineSpacingMultiplier = 16843288; // 0x1010218		field public static final int lineSpacingMultiplier = 16843288; // 0x1010218
	field public static final int lines = 16843092; // 0x1010154		field public static final int lines = 16843092; // 0x1010154
	@@ -813,7 +813,7 @@ package android {
	field public static final int marqueeRepeatLimit = 16843293; // 0x101021d		field public static final int marqueeRepeatLimit = 16843293; // 0x101021d
	field public static final int matchOrder = 16843855; // 0x101044f		field public static final int matchOrder = 16843855; // 0x101044f
	field public static final int max = 16843062; // 0x1010136		field public static final int max = 16843062; // 0x1010136
	field public static final int maxButtonHeight = 16844029; // 0x10104fd		field public static final int maxButtonHeight = 16844030; // 0x10104fe
	field public static final int maxDate = 16843584; // 0x1010340		field public static final int maxDate = 16843584; // 0x1010340
	field public static final int maxEms = 16843095; // 0x1010157		field public static final int maxEms = 16843095; // 0x1010157
	field public static final int maxHeight = 16843040; // 0x1010120		field public static final int maxHeight = 16843040; // 0x1010120

Original line number	Original line	Diff line number	Diff line
	@@ -413,7 +413,7 @@ package android {
	field public static final int buttonBarNeutralButtonStyle = 16843914; // 0x101048a		field public static final int buttonBarNeutralButtonStyle = 16843914; // 0x101048a
	field public static final int buttonBarPositiveButtonStyle = 16843913; // 0x1010489		field public static final int buttonBarPositiveButtonStyle = 16843913; // 0x1010489
	field public static final int buttonBarStyle = 16843566; // 0x101032e		field public static final int buttonBarStyle = 16843566; // 0x101032e
	field public static final int buttonGravity = 16844030; // 0x10104fe		field public static final int buttonGravity = 16844031; // 0x10104ff
	field public static final int buttonStyle = 16842824; // 0x1010048		field public static final int buttonStyle = 16842824; // 0x1010048
	field public static final int buttonStyleInset = 16842826; // 0x101004a		field public static final int buttonStyleInset = 16842826; // 0x101004a
	field public static final int buttonStyleSmall = 16842825; // 0x1010049		field public static final int buttonStyleSmall = 16842825; // 0x1010049
	@@ -463,7 +463,7 @@ package android {
	field public static final int codes = 16843330; // 0x1010242		field public static final int codes = 16843330; // 0x1010242
	field public static final int collapseColumns = 16843083; // 0x101014b		field public static final int collapseColumns = 16843083; // 0x101014b
	field public static final int collapseContentDescription = 16843984; // 0x10104d0		field public static final int collapseContentDescription = 16843984; // 0x10104d0
	field public static final int collapseIcon = 16844031; // 0x10104ff		field public static final int collapseIcon = 16844032; // 0x1010500
	field public static final int color = 16843173; // 0x10101a5		field public static final int color = 16843173; // 0x10101a5
	field public static final int colorAccent = 16843829; // 0x1010435		field public static final int colorAccent = 16843829; // 0x1010435
	field public static final int colorActivatedHighlight = 16843664; // 0x1010390		field public static final int colorActivatedHighlight = 16843664; // 0x1010390
	@@ -504,7 +504,7 @@ package android {
	field public static final int contentInsetRight = 16843862; // 0x1010456		field public static final int contentInsetRight = 16843862; // 0x1010456
	field public static final int contentInsetStart = 16843859; // 0x1010453		field public static final int contentInsetStart = 16843859; // 0x1010453
	field public static final int contextClickable = 16844007; // 0x10104e7		field public static final int contextClickable = 16844007; // 0x10104e7
	field public static final int contextPopupMenuStyle = 16844033; // 0x1010501		field public static final int contextPopupMenuStyle = 16844034; // 0x1010502
	field public static final int controlX1 = 16843772; // 0x10103fc		field public static final int controlX1 = 16843772; // 0x10103fc
	field public static final int controlX2 = 16843774; // 0x10103fe		field public static final int controlX2 = 16843774; // 0x10103fe
	field public static final int controlY1 = 16843773; // 0x10103fd		field public static final int controlY1 = 16843773; // 0x10103fd
	@@ -872,7 +872,7 @@ package android {
	field public static final int layout_y = 16843136; // 0x1010180		field public static final int layout_y = 16843136; // 0x1010180
	field public static final int left = 16843181; // 0x10101ad		field public static final int left = 16843181; // 0x10101ad
	field public static final int letterSpacing = 16843958; // 0x10104b6		field public static final int letterSpacing = 16843958; // 0x10104b6
	field public static final int level = 16844032; // 0x1010500		field public static final int level = 16844033; // 0x1010501
	field public static final int lineSpacingExtra = 16843287; // 0x1010217		field public static final int lineSpacingExtra = 16843287; // 0x1010217
	field public static final int lineSpacingMultiplier = 16843288; // 0x1010218		field public static final int lineSpacingMultiplier = 16843288; // 0x1010218
	field public static final int lines = 16843092; // 0x1010154		field public static final int lines = 16843092; // 0x1010154
	@@ -905,7 +905,7 @@ package android {
	field public static final int marqueeRepeatLimit = 16843293; // 0x101021d		field public static final int marqueeRepeatLimit = 16843293; // 0x101021d
	field public static final int matchOrder = 16843855; // 0x101044f		field public static final int matchOrder = 16843855; // 0x101044f
	field public static final int max = 16843062; // 0x1010136		field public static final int max = 16843062; // 0x1010136
	field public static final int maxButtonHeight = 16844029; // 0x10104fd		field public static final int maxButtonHeight = 16844030; // 0x10104fe
	field public static final int maxDate = 16843584; // 0x1010340		field public static final int maxDate = 16843584; // 0x1010340
	field public static final int maxEms = 16843095; // 0x1010157		field public static final int maxEms = 16843095; // 0x1010157
	field public static final int maxHeight = 16843040; // 0x1010120		field public static final int maxHeight = 16843040; // 0x1010120