Merge changes from topic "reparentTasks" (f7172880) · Commits · e / os / android_frameworks_base

core/api/test-current.txt

+2 −1

Original line number	Diff line number	Diff line
		@@ -2512,7 +2512,6 @@ package android.window {
		method @CallSuper @NonNull @RequiresPermission(android.Manifest.permission.MANAGE_ACTIVITY_TASKS) public java.util.List<android.window.TaskAppearedInfo> registerOrganizer();
		method @BinderThread public void removeStartingWindow(int);
		method @RequiresPermission(android.Manifest.permission.MANAGE_ACTIVITY_TASKS) public void setInterceptBackPressedOnTaskRoot(@NonNull android.window.WindowContainerToken, boolean);
		method @RequiresPermission(android.Manifest.permission.MANAGE_ACTIVITY_TASKS) public void setLaunchRoot(int, @NonNull android.window.WindowContainerToken);
		method @CallSuper @RequiresPermission(android.Manifest.permission.MANAGE_ACTIVITY_TASKS) public void unregisterOrganizer();
		}

		@@ -2527,6 +2526,7 @@ package android.window {
		method public int describeContents();
		method @NonNull public android.window.WindowContainerTransaction reorder(@NonNull android.window.WindowContainerToken, boolean);
		method @NonNull public android.window.WindowContainerTransaction reparent(@NonNull android.window.WindowContainerToken, @Nullable android.window.WindowContainerToken, boolean);
		method @NonNull public android.window.WindowContainerTransaction reparentTasks(@Nullable android.window.WindowContainerToken, @Nullable android.window.WindowContainerToken, @Nullable int[], @Nullable int[], boolean);
		method @NonNull public android.window.WindowContainerTransaction scheduleFinishEnterPip(@NonNull android.window.WindowContainerToken, @NonNull android.graphics.Rect);
		method @NonNull public android.window.WindowContainerTransaction setActivityWindowingMode(@NonNull android.window.WindowContainerToken, int);
		method @NonNull public android.window.WindowContainerTransaction setAppBounds(@NonNull android.window.WindowContainerToken, @NonNull android.graphics.Rect);
		@@ -2534,6 +2534,7 @@ package android.window {
		method @NonNull public android.window.WindowContainerTransaction setBoundsChangeTransaction(@NonNull android.window.WindowContainerToken, @NonNull android.view.SurfaceControl.Transaction);
		method @NonNull public android.window.WindowContainerTransaction setFocusable(@NonNull android.window.WindowContainerToken, boolean);
		method @NonNull public android.window.WindowContainerTransaction setHidden(@NonNull android.window.WindowContainerToken, boolean);
		method @NonNull public android.window.WindowContainerTransaction setLaunchRoot(@NonNull android.window.WindowContainerToken, @Nullable int[], @Nullable int[]);
		method @NonNull public android.window.WindowContainerTransaction setScreenSizeDp(@NonNull android.window.WindowContainerToken, int, int);
		method @NonNull public android.window.WindowContainerTransaction setSmallestScreenWidthDp(@NonNull android.window.WindowContainerToken, int);
		method @NonNull public android.window.WindowContainerTransaction setWindowingMode(@NonNull android.window.WindowContainerToken, int);

core/java/android/window/ITaskOrganizerController.aidl

+0 −6

Original line number	Diff line number	Diff line
		@@ -55,12 +55,6 @@ interface ITaskOrganizerController {
		/** Get the root task which contains the current ime target */
		WindowContainerToken getImeTarget(int display);

		/**
		* Set's the root task to launch new tasks into on a display. {@code null} means no launch root
		* and thus new tasks just end up directly on the display.
		*/
		void setLaunchRoot(int displayId, in WindowContainerToken root);

		/**
		* Requests that the given task organizer is notified when back is pressed on the root activity
		* of one of its controlled tasks.

core/java/android/window/TaskOrganizer.java

+0 −13

Original line number	Diff line number	Diff line
		@@ -183,19 +183,6 @@ public class TaskOrganizer extends WindowOrganizer {
		}
		}

		/**
		* Set's the root task to launch new tasks into on a display. {@code null} means no launch
		* root and thus new tasks just end up directly on the display.
		*/
		@RequiresPermission(android.Manifest.permission.MANAGE_ACTIVITY_TASKS)
		public void setLaunchRoot(int displayId, @NonNull WindowContainerToken root) {
		try {
		mTaskOrganizerController.setLaunchRoot(displayId, root);
		} catch (RemoteException e) {
		throw e.rethrowFromSystemServer();
		}
		}

		/**
		* Requests that the given task organizer is notified when back is pressed on the root activity
		* of one of its controlled tasks.

core/java/android/window/WindowContainerTransaction.java

+126 −15

Original line number	Diff line number	Diff line
		@@ -30,6 +30,7 @@ import android.util.ArrayMap;
		import android.view.SurfaceControl;

		import java.util.ArrayList;
		import java.util.Arrays;
		import java.util.List;
		import java.util.Map;

		@@ -263,8 +264,9 @@ public final class WindowContainerTransaction implements Parcelable {
		@NonNull
		public WindowContainerTransaction reparent(@NonNull WindowContainerToken child,
		@Nullable WindowContainerToken parent, boolean onTop) {
		mHierarchyOps.add(new HierarchyOp(child.asBinder(),
		parent == null ? null : parent.asBinder(), onTop));
		mHierarchyOps.add(HierarchyOp.createForReparent(child.asBinder(),
		parent == null ? null : parent.asBinder(),
		onTop));
		return this;
		}

		@@ -276,7 +278,47 @@ public final class WindowContainerTransaction implements Parcelable {
		*/
		@NonNull
		public WindowContainerTransaction reorder(@NonNull WindowContainerToken child, boolean onTop) {
		mHierarchyOps.add(new HierarchyOp(child.asBinder(), onTop));
		mHierarchyOps.add(HierarchyOp.createForReorder(child.asBinder(), onTop));
		return this;
		}

		/**
		* Reparent's all children tasks of {@param currentParent} in the specified
		* {@param windowingMode} and {@param activityType} to {@param newParent} in their current
		* z-order.
		*
		* @param currentParent of the tasks to perform the operation no.
		* {@code null} will perform the operation on the display.
		* @param newParent for the tasks. {@code null} will perform the operation on the display.
		* @param windowingModes of the tasks to reparent.
		* @param activityTypes of the tasks to reparent.
		* @param onTop When {@code true}, the child goes to the top of parent; otherwise it goes to
		* the bottom.
		*/
		@NonNull
		public WindowContainerTransaction reparentTasks(@Nullable WindowContainerToken currentParent,
		@Nullable WindowContainerToken newParent, @Nullable int[] windowingModes,
		@Nullable int[] activityTypes, boolean onTop) {
		mHierarchyOps.add(HierarchyOp.createForChildrenTasksReparent(
		currentParent != null ? currentParent.asBinder() : null,
		newParent != null ? newParent.asBinder() : null,
		windowingModes,
		activityTypes,
		onTop));
		return this;
		}

		/**
		* Sets whether a container should be the launch root for the specified windowing mode and
		* activity type. This currently only applies to Task containers created by organizer.
		*/
		@NonNull
		public WindowContainerTransaction setLaunchRoot(@NonNull WindowContainerToken container,
		@Nullable int[] windowingModes, @Nullable int[] activityTypes) {
		mHierarchyOps.add(HierarchyOp.createForSetLaunchRoot(
		container.asBinder(),
		windowingModes,
		activityTypes));
		return this;
		}

		@@ -363,6 +405,7 @@ public final class WindowContainerTransaction implements Parcelable {
		private boolean mFocusable = true;
		private boolean mHidden = false;
		private boolean mIgnoreOrientationRequest = false;

		private int mChangeMask = 0;
		private @ActivityInfo.Config int mConfigSetMask = 0;
		private @WindowConfiguration.WindowConfig int mWindowSetMask = 0;
		@@ -595,6 +638,14 @@ public final class WindowContainerTransaction implements Parcelable {
		* @hide
		*/
		public static class HierarchyOp implements Parcelable {
		public static final int HIERARCHY_OP_TYPE_REPARENT = 0;
		public static final int HIERARCHY_OP_TYPE_REORDER = 1;
		public static final int HIERARCHY_OP_TYPE_CHILDREN_TASKS_REPARENT = 2;
		public static final int HIERARCHY_OP_TYPE_SET_LAUNCH_ROOT = 3;

		private final int mType;

		// Container we are performing the operation on.
		private final IBinder mContainer;

		// If this is same as mContainer, then only change position, don't reparent.
		@@ -603,32 +654,68 @@ public final class WindowContainerTransaction implements Parcelable {
		// Moves/reparents to top of parent when {@code true}, otherwise moves/reparents to bottom.
		private final boolean mToTop;

		public HierarchyOp(@NonNull IBinder container, @Nullable IBinder reparent, boolean toTop) {
		mContainer = container;
		mReparent = reparent;
		mToTop = toTop;
		final private int[] mWindowingModes;
		final private int[] mActivityTypes;

		public static HierarchyOp createForReparent(
		@NonNull IBinder container, @Nullable IBinder reparent, boolean toTop) {
		return new HierarchyOp(HIERARCHY_OP_TYPE_REPARENT,
		container, reparent, null, null, toTop);
		}

		public HierarchyOp(@NonNull IBinder container, boolean toTop) {
		public static HierarchyOp createForReorder(@NonNull IBinder container, boolean toTop) {
		return new HierarchyOp(HIERARCHY_OP_TYPE_REORDER,
		container, container, null, null, toTop);
		}

		public static HierarchyOp createForChildrenTasksReparent(IBinder currentParent,
		IBinder newParent, int[] windowingModes, int[] activityTypes, boolean onTop) {
		return new HierarchyOp(HIERARCHY_OP_TYPE_CHILDREN_TASKS_REPARENT,
		currentParent, newParent, windowingModes, activityTypes, onTop);
		}

		public static HierarchyOp createForSetLaunchRoot(IBinder container,
		int[] windowingModes, int[] activityTypes) {
		return new HierarchyOp(HIERARCHY_OP_TYPE_SET_LAUNCH_ROOT,
		container, null, windowingModes, activityTypes, false);
		}

		private HierarchyOp(int type, @NonNull IBinder container, @Nullable IBinder reparent,
		int[] windowingModes, int[] activityTypes, boolean toTop) {
		mType = type;
		mContainer = container;
		mReparent = container;
		mReparent = reparent;
		mWindowingModes = windowingModes != null ?
		Arrays.copyOf(windowingModes, windowingModes.length) : null;
		mActivityTypes = activityTypes != null ?
		Arrays.copyOf(activityTypes, activityTypes.length) : null;
		mToTop = toTop;
		}

		public HierarchyOp(@NonNull HierarchyOp copy) {
		mType = copy.mType;
		mContainer = copy.mContainer;
		mReparent = copy.mReparent;
		mToTop = copy.mToTop;
		mWindowingModes = copy.mWindowingModes;
		mActivityTypes = copy.mActivityTypes;
		}

		protected HierarchyOp(Parcel in) {
		mType = in.readInt();
		mContainer = in.readStrongBinder();
		mReparent = in.readStrongBinder();
		mToTop = in.readBoolean();
		mWindowingModes = in.createIntArray();
		mActivityTypes = in.createIntArray();
		}

		public int getType() {
		return mType;
		}

		public boolean isReparent() {
		return mContainer != mReparent;
		return mType == HIERARCHY_OP_TYPE_REPARENT;
		}

		@Nullable
		@@ -645,21 +732,45 @@ public final class WindowContainerTransaction implements Parcelable {
		return mToTop;
		}

		public int[] getWindowingModes() {
		return mWindowingModes;
		}

		public int[] getActivityTypes() {
		return mActivityTypes;
		}

		@Override
		public String toString() {
		if (isReparent()) {
		switch (mType) {
		case HIERARCHY_OP_TYPE_CHILDREN_TASKS_REPARENT:
		return "{ChildrenTasksReparent: from=" + mContainer + " to=" + mReparent
		+ " mToTop=" + mToTop + " mWindowingMode=" + mWindowingModes
		+ " mActivityType=" + mActivityTypes + "}";
		case HIERARCHY_OP_TYPE_SET_LAUNCH_ROOT:
		return "{SetLaunchRoot: container=" + mContainer
		+ " mWindowingMode=" + mWindowingModes
		+ " mActivityType=" + mActivityTypes + "}";
		case HIERARCHY_OP_TYPE_REPARENT:
		return "{reparent: " + mContainer + " to " + (mToTop ? "top of " : "bottom of ")
		+ mReparent + "}";
		} else {
		case HIERARCHY_OP_TYPE_REORDER:
		return "{reorder: " + mContainer + " to " + (mToTop ? "top" : "bottom") + "}";
		default:
		return "{mType=" + mType + " container=" + mContainer + " reparent=" + mReparent
		+ " mToTop=" + mToTop + " mWindowingMode=" + mWindowingModes
		+ " mActivityType=" + mActivityTypes + "}";
		}
		}

		@Override
		public void writeToParcel(Parcel dest, int flags) {
		dest.writeInt(mType);
		dest.writeStrongBinder(mContainer);
		dest.writeStrongBinder(mReparent);
		dest.writeBoolean(mToTop);
		dest.writeIntArray(mWindowingModes);
		dest.writeIntArray(mActivityTypes);
		}

		@Override

libs/WindowManager/Shell/src/com/android/wm/shell/legacysplitscreen/WindowManagerProxy.java

+19 −4

Original line number	Diff line number	Diff line
		@@ -18,7 +18,10 @@ package com.android.wm.shell.legacysplitscreen;

		import static android.app.WindowConfiguration.ACTIVITY_TYPE_HOME;
		import static android.app.WindowConfiguration.ACTIVITY_TYPE_RECENTS;
		import static android.app.WindowConfiguration.ACTIVITY_TYPE_STANDARD;
		import static android.app.WindowConfiguration.ACTIVITY_TYPE_UNDEFINED;
		import static android.app.WindowConfiguration.WINDOWING_MODE_FULLSCREEN;
		import static android.app.WindowConfiguration.WINDOWING_MODE_SPLIT_SCREEN_SECONDARY;
		import static android.app.WindowConfiguration.WINDOWING_MODE_UNDEFINED;
		import static android.content.res.Configuration.ORIENTATION_LANDSCAPE;
		import static android.content.res.Configuration.ORIENTATION_UNDEFINED;
		@@ -54,6 +57,17 @@ class WindowManagerProxy {

		private static final String TAG = "WindowManagerProxy";
		private static final int[] HOME_AND_RECENTS = {ACTIVITY_TYPE_HOME, ACTIVITY_TYPE_RECENTS};
		private static final int[] CONTROLLED_ACTIVITY_TYPES = {
		ACTIVITY_TYPE_STANDARD,
		ACTIVITY_TYPE_HOME,
		ACTIVITY_TYPE_RECENTS,
		ACTIVITY_TYPE_UNDEFINED
		};
		private static final int[] CONTROLLED_WINDOWING_MODES = {
		WINDOWING_MODE_FULLSCREEN,
		WINDOWING_MODE_SPLIT_SCREEN_SECONDARY,
		WINDOWING_MODE_UNDEFINED
		};

		@GuardedBy("mDockedRect")
		private final Rect mDockedRect = new Rect();
		@@ -191,8 +205,9 @@ class WindowManagerProxy {
		// Set launchtile first so that any stack created after
		// getAllRootTaskInfos and before reparent (even if unlikely) are placed
		// correctly.
		mTaskOrganizer.setLaunchRoot(DEFAULT_DISPLAY, tiles.mSecondary.token);
		WindowContainerTransaction wct = new WindowContainerTransaction();
		wct.setLaunchRoot(tiles.mSecondary.token, CONTROLLED_WINDOWING_MODES,
		CONTROLLED_ACTIVITY_TYPES);
		final boolean isHomeResizable = buildEnterSplit(wct, tiles, layout);
		applySyncTransaction(wct);
		return isHomeResizable;
		@@ -251,12 +266,12 @@ class WindowManagerProxy {
		/** @see #buildDismissSplit */
		void applyDismissSplit(LegacySplitScreenTaskListener tiles, LegacySplitDisplayLayout layout,
		boolean dismissOrMaximize) {
		// Set launch root first so that any task created after getChildContainers and
		// before reparent (pretty unlikely) are put into fullscreen.
		mTaskOrganizer.setLaunchRoot(Display.DEFAULT_DISPLAY, null);
		// TODO(task-org): Once task-org is more complete, consider using Appeared/Vanished
		// plus specific APIs to clean this up.
		final WindowContainerTransaction wct = new WindowContainerTransaction();
		// Set launch root first so that any task created after getChildContainers and
		// before reparent (pretty unlikely) are put into fullscreen.
		wct.setLaunchRoot(tiles.mSecondary.token, null, null);
		buildDismissSplit(wct, tiles, layout, dismissOrMaximize);
		applySyncTransaction(wct);
		}