Merge "App-pairs baseline commit" (40901fa0) · Commits · e / os / android_frameworks_base

libs/WindowManager/Shell/res/raw/wm_shell_protolog.json

+42 −0

Original line number	Diff line number	Diff line
		@@ -79,6 +79,12 @@
		"group": "WM_SHELL_TASK_ORG",
		"at": "com\/android\/wm\/shell\/splitscreen\/SplitScreenTaskListener.java"
		},
		"-742394458": {
		"message": "pair task1=%d task2=%d in AppPair=%s",
		"level": "VERBOSE",
		"group": "WM_SHELL_TASK_ORG",
		"at": "com\/android\/wm\/shell\/apppairs\/AppPair.java"
		},
		"-710770147": {
		"message": "Add target: %s",
		"level": "VERBOSE",
		@@ -91,6 +97,12 @@
		"group": "WM_SHELL_TASK_ORG",
		"at": "com\/android\/wm\/shell\/splitscreen\/SplitScreenTaskListener.java"
		},
		"-234284913": {
		"message": "unpair taskId=%d pair=%s",
		"level": "VERBOSE",
		"group": "WM_SHELL_TASK_ORG",
		"at": "com\/android\/wm\/shell\/apppairs\/AppPairsController.java"
		},
		"-191422040": {
		"message": "Transition animations finished, notifying core %s",
		"level": "VERBOSE",
		@@ -139,12 +151,30 @@
		"group": "WM_SHELL_TASK_ORG",
		"at": "com\/android\/wm\/shell\/ShellTaskOrganizer.java"
		},
		"900599280": {
		"message": "Can't pair unresizeable tasks task1.isResizeable=%b task1.isResizeable=%b",
		"level": "ERROR",
		"group": "WM_SHELL_TASK_ORG",
		"at": "com\/android\/wm\/shell\/apppairs\/AppPair.java"
		},
		"950299522": {
		"message": "taskId %d isn't isn't in an app-pair.",
		"level": "VERBOSE",
		"group": "WM_SHELL_TASK_ORG",
		"at": "com\/android\/wm\/shell\/apppairs\/AppPairsController.java"
		},
		"980952660": {
		"message": "Task root back pressed taskId=%d",
		"level": "VERBOSE",
		"group": "WM_SHELL_TASK_ORG",
		"at": "com\/android\/wm\/shell\/ShellTaskOrganizer.java"
		},
		"1079041527": {
		"message": "incrementPool size=%d",
		"level": "VERBOSE",
		"group": "WM_SHELL_TASK_ORG",
		"at": "com\/android\/wm\/shell\/apppairs\/AppPairsPool.java"
		},
		"1104702476": {
		"message": "Letterbox Task Changed: #%d",
		"level": "VERBOSE",
		@@ -175,12 +205,24 @@
		"group": "WM_SHELL_DRAG_AND_DROP",
		"at": "com\/android\/wm\/shell\/draganddrop\/DragAndDropController.java"
		},
		"1891981945": {
		"message": "release entry.taskId=%s listener=%s size=%d",
		"level": "VERBOSE",
		"group": "WM_SHELL_TASK_ORG",
		"at": "com\/android\/wm\/shell\/apppairs\/AppPairsPool.java"
		},
		"1990759023": {
		"message": "addListenerForType types=%s listener=%s",
		"level": "VERBOSE",
		"group": "WM_SHELL_TASK_ORG",
		"at": "com\/android\/wm\/shell\/ShellTaskOrganizer.java"
		},
		"2006473416": {
		"message": "acquire entry.taskId=%s listener=%s size=%d",
		"level": "VERBOSE",
		"group": "WM_SHELL_TASK_ORG",
		"at": "com\/android\/wm\/shell\/apppairs\/AppPairsPool.java"
		},
		"2057038970": {
		"message": "Display changed: %d",
		"level": "VERBOSE",

libs/WindowManager/Shell/src/com/android/wm/shell/ShellDump.java

+8 −1

Original line number	Diff line number	Diff line
		@@ -16,6 +16,7 @@

		package com.android.wm.shell;

		import com.android.wm.shell.apppairs.AppPairs;
		import com.android.wm.shell.hidedisplaycutout.HideDisplayCutout;
		import com.android.wm.shell.onehanded.OneHanded;
		import com.android.wm.shell.pip.Pip;
		@@ -34,17 +35,20 @@ public class ShellDump {
		private final Optional<OneHanded> mOneHandedOptional;
		private final Optional<HideDisplayCutout> mHideDisplayCutout;
		private final ShellTaskOrganizer mShellTaskOrganizer;
		private final Optional<AppPairs> mAppPairsOptional;

		public ShellDump(ShellTaskOrganizer shellTaskOrganizer,
		Optional<SplitScreen> splitScreenOptional,
		Optional<Pip> pipOptional,
		Optional<OneHanded> oneHandedOptional,
		Optional<HideDisplayCutout> hideDisplayCutout) {
		Optional<HideDisplayCutout> hideDisplayCutout,
		Optional<AppPairs> appPairsOptional) {
		mShellTaskOrganizer = shellTaskOrganizer;
		mSplitScreenOptional = splitScreenOptional;
		mPipOptional = pipOptional;
		mOneHandedOptional = oneHandedOptional;
		mHideDisplayCutout = hideDisplayCutout;
		mAppPairsOptional = appPairsOptional;
		}

		public void dump(PrintWriter pw) {
		@@ -55,5 +59,8 @@ public class ShellDump {
		mSplitScreenOptional.ifPresent(splitScreen -> splitScreen.dump(pw));
		mOneHandedOptional.ifPresent(oneHanded -> oneHanded.dump(pw));
		mHideDisplayCutout.ifPresent(hideDisplayCutout -> hideDisplayCutout.dump(pw));
		pw.println();
		pw.println();
		mAppPairsOptional.ifPresent(appPairs -> appPairs.dump(pw, ""));
		}
		}

libs/WindowManager/Shell/src/com/android/wm/shell/ShellInit.java

+6 −1

Original line number	Diff line number	Diff line
		@@ -16,6 +16,7 @@

		package com.android.wm.shell;

		import com.android.wm.shell.apppairs.AppPairs;
		import com.android.wm.shell.common.DisplayImeController;
		import com.android.wm.shell.draganddrop.DragAndDropController;
		import com.android.wm.shell.splitscreen.SplitScreen;
		@@ -31,15 +32,18 @@ public class ShellInit {
		private final DragAndDropController mDragAndDropController;
		private final ShellTaskOrganizer mShellTaskOrganizer;
		private final Optional<SplitScreen> mSplitScreenOptional;
		private final Optional<AppPairs> mAppPairsOptional;

		public ShellInit(DisplayImeController displayImeController,
		DragAndDropController dragAndDropController,
		ShellTaskOrganizer shellTaskOrganizer,
		Optional<SplitScreen> splitScreenOptional) {
		Optional<SplitScreen> splitScreenOptional,
		Optional<AppPairs> appPairsOptional) {
		mDisplayImeController = displayImeController;
		mDragAndDropController = dragAndDropController;
		mShellTaskOrganizer = shellTaskOrganizer;
		mSplitScreenOptional = splitScreenOptional;
		mAppPairsOptional = appPairsOptional;
		}

		public void init() {
		@@ -47,6 +51,7 @@ public class ShellInit {
		mDisplayImeController.startMonitorDisplays();
		// Register the shell organizer
		mShellTaskOrganizer.registerOrganizer();
		mAppPairsOptional.ifPresent(AppPairs::onOrganizerRegistered);
		// Bind the splitscreen impl to the drag drop controller
		mDragAndDropController.setSplitScreenController(mSplitScreenOptional);
		}

libs/WindowManager/Shell/src/com/android/wm/shell/ShellTaskOrganizer.java

+10 −1

Original line number	Diff line number	Diff line
		@@ -26,7 +26,6 @@ import static com.android.wm.shell.protolog.ShellProtoLogGroup.WM_SHELL_TASK_ORG

		import android.annotation.IntDef;
		import android.app.ActivityManager.RunningTaskInfo;
		import android.app.WindowConfiguration.WindowingMode;
		import android.content.Context;
		import android.os.Binder;
		import android.os.IBinder;
		@@ -39,6 +38,7 @@ import android.window.TaskAppearedInfo;
		import android.window.TaskOrganizer;

		import androidx.annotation.NonNull;
		import androidx.annotation.Nullable;

		import com.android.internal.annotations.VisibleForTesting;
		import com.android.internal.protolog.common.ProtoLog;
		@@ -309,6 +309,15 @@ public class ShellTaskOrganizer extends TaskOrganizer {
		}
		}

		/** Gets running task by taskId. Returns {@code null} if no such task observed. */
		@Nullable
		public RunningTaskInfo getRunningTaskInfo(int taskId) {
		synchronized (mLock) {
		final TaskAppearedInfo info = mTasks.get(taskId);
		return info != null ? info.getTaskInfo() : null;
		}
		}

		private boolean updateTaskListenerIfNeeded(RunningTaskInfo taskInfo, SurfaceControl leash,
		TaskListener oldListener, TaskListener newListener) {
		if (oldListener == newListener) return false;

libs/WindowManager/Shell/src/com/android/wm/shell/apppairs/AppPair.java

0 → 100644

+208 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2020 The Android Open Source Project
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		* You may obtain a copy of the License at
		*
		* http://www.apache.org/licenses/LICENSE-2.0
		*
		* Unless required by applicable law or agreed to in writing, software
		* distributed under the License is distributed on an "AS IS" BASIS,
		* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		* See the License for the specific language governing permissions and
		* limitations under the License.
		*/

		package com.android.wm.shell.apppairs;

		import static android.app.ActivityTaskManager.INVALID_TASK_ID;
		import static android.app.WindowConfiguration.WINDOWING_MODE_MULTI_WINDOW;
		import static android.app.WindowConfiguration.WINDOWING_MODE_UNDEFINED;

		import static com.android.wm.shell.protolog.ShellProtoLogGroup.WM_SHELL_TASK_ORG;

		import android.app.ActivityManager;
		import android.graphics.Rect;
		import android.view.SurfaceControl;
		import android.window.WindowContainerToken;
		import android.window.WindowContainerTransaction;

		import androidx.annotation.NonNull;

		import com.android.internal.protolog.common.ProtoLog;
		import com.android.wm.shell.ShellTaskOrganizer;
		import com.android.wm.shell.common.SyncTransactionQueue;

		import java.io.PrintWriter;

		/**
		* An app-pairs consisting of {@link #mRootTaskInfo} that acts as the hierarchy parent of
		* {@link #mTaskInfo1} and {@link #mTaskInfo2} in the pair.
		* Also includes all UI for managing the pair like the divider.
		*/
		// TODO: Add divider
		// TODO: Handle display rotation
		class AppPair implements ShellTaskOrganizer.TaskListener {
		private static final String TAG = AppPair.class.getSimpleName();

		private ActivityManager.RunningTaskInfo mRootTaskInfo;
		private SurfaceControl mRootTaskLeash;
		private ActivityManager.RunningTaskInfo mTaskInfo1;
		private SurfaceControl mTaskLeash1;
		private ActivityManager.RunningTaskInfo mTaskInfo2;
		private SurfaceControl mTaskLeash2;

		private final AppPairsController mController;
		private final SyncTransactionQueue mSyncQueue;

		AppPair(AppPairsController controller) {
		mController = controller;
		mSyncQueue = controller.getSyncTransactionQueue();
		}

		int getRootTaskId() {
		return mRootTaskInfo != null ? mRootTaskInfo.taskId : INVALID_TASK_ID;
		}

		private int getTaskId1() {
		return mTaskInfo1 != null ? mTaskInfo1.taskId : INVALID_TASK_ID;
		}

		private int getTaskId2() {
		return mTaskInfo2 != null ? mTaskInfo2.taskId : INVALID_TASK_ID;
		}

		boolean contains(int taskId) {
		return taskId == getRootTaskId() \|\| taskId == getTaskId1() \|\| taskId == getTaskId2();
		}

		boolean pair(ActivityManager.RunningTaskInfo task1, ActivityManager.RunningTaskInfo task2) {
		ProtoLog.v(WM_SHELL_TASK_ORG, "pair task1=%d task2=%d in AppPair=%s",
		task1.taskId, task2.taskId, this);

		if (!task1.isResizeable \|\| !task2.isResizeable) {
		ProtoLog.e(WM_SHELL_TASK_ORG,
		"Can't pair unresizeable tasks task1.isResizeable=%b task1.isResizeable=%b",
		task1.isResizeable, task2.isResizeable);
		return false;
		}

		mTaskInfo1 = task1;
		mTaskInfo2 = task2;

		// TODO: properly calculate bounds for pairs.
		final Rect rootBounds = mRootTaskInfo.configuration.windowConfiguration.getBounds();
		final Rect bounds1 = new Rect(
		rootBounds.left, rootBounds.top, rootBounds.right / 2, rootBounds.bottom / 2);
		final Rect bounds2 = new Rect(
		bounds1.right, bounds1.bottom, rootBounds.right, rootBounds.bottom);
		final WindowContainerToken token1 = task1.token;
		final WindowContainerToken token2 = task2.token;
		final WindowContainerTransaction wct = new WindowContainerTransaction();

		wct.setHidden(mRootTaskInfo.token, false)
		.reparent(token1, mRootTaskInfo.token, true /* onTop */)
		.reparent(token2, mRootTaskInfo.token, true /* onTop */)
		.setWindowingMode(token1, WINDOWING_MODE_MULTI_WINDOW)
		.setWindowingMode(token2, WINDOWING_MODE_MULTI_WINDOW)
		.setBounds(token1, bounds1)
		.setBounds(token2, bounds2)
		// Moving the root task to top after the child tasks were repareted , or the root
		// task cannot be visible and focused.
		.reorder(mRootTaskInfo.token, true);
		mController.getTaskOrganizer().applyTransaction(wct);
		return true;
		}

		void unpair() {
		final WindowContainerToken token1 = mTaskInfo1.token;
		final WindowContainerToken token2 = mTaskInfo2.token;
		final WindowContainerTransaction wct = new WindowContainerTransaction();

		// Reparent out of this container and reset windowing mode.
		wct.setHidden(mRootTaskInfo.token, true)
		.reorder(mRootTaskInfo.token, false)
		.reparent(token1, null, false /* onTop */)
		.reparent(token2, null, false /* onTop */)
		.setWindowingMode(token1, WINDOWING_MODE_UNDEFINED)
		.setWindowingMode(token2, WINDOWING_MODE_UNDEFINED);
		mController.getTaskOrganizer().applyTransaction(wct);

		mTaskInfo1 = null;
		mTaskInfo2 = null;
		}

		@Override
		public void onTaskAppeared(ActivityManager.RunningTaskInfo taskInfo, SurfaceControl leash) {
		if (mRootTaskInfo == null \|\| taskInfo.taskId == mRootTaskInfo.taskId) {
		mRootTaskInfo = taskInfo;
		mRootTaskLeash = leash;
		} else if (taskInfo.taskId == getTaskId1()) {
		mTaskInfo1 = taskInfo;
		mTaskLeash1 = leash;
		} else if (taskInfo.taskId == getTaskId2()) {
		mTaskInfo2 = taskInfo;
		mTaskLeash2 = leash;
		} else {
		throw new IllegalStateException("Unknown task=" + taskInfo.taskId);
		}

		if (mTaskLeash1 == null \|\| mTaskLeash2 == null) return;

		// TODO: Is there more we need to do here?
		mSyncQueue.runInSync(t -> t
		.setPosition(mTaskLeash1, mTaskInfo1.positionInParent.x,
		mTaskInfo1.positionInParent.y)
		.setPosition(mTaskLeash2, mTaskInfo2.positionInParent.x,
		mTaskInfo2.positionInParent.y)
		.show(mRootTaskLeash)
		.show(mTaskLeash1)
		.show(mTaskLeash2));
		}

		@Override
		public void onTaskInfoChanged(ActivityManager.RunningTaskInfo taskInfo) {
		if (taskInfo.taskId == getRootTaskId()) {
		mRootTaskInfo = taskInfo;
		} else if (taskInfo.taskId == getTaskId1()) {
		mTaskInfo1 = taskInfo;
		} else if (taskInfo.taskId == getTaskId2()) {
		mTaskInfo2 = taskInfo;
		} else {
		throw new IllegalStateException("Unknown task=" + taskInfo.taskId);
		}
		}

		@Override
		public void onTaskVanished(ActivityManager.RunningTaskInfo taskInfo) {
		if (taskInfo.taskId == getRootTaskId()) {
		// We don't want to release this object back to the pool since the root task went away.
		mController.unpair(mRootTaskInfo.taskId, false /* releaseToPool */);
		} else if (taskInfo.taskId == getTaskId1() \|\| taskInfo.taskId == getTaskId2()) {
		mController.unpair(mRootTaskInfo.taskId);
		}
		}

		@Override
		public void dump(@NonNull PrintWriter pw, String prefix) {
		final String innerPrefix = prefix + " ";
		final String childPrefix = innerPrefix + " ";
		pw.println(prefix + this);
		pw.println(innerPrefix + "Root taskId=" + getRootTaskId()
		+ " winMode=" + mRootTaskInfo.getWindowingMode());
		if (mTaskInfo1 != null) {
		pw.println(innerPrefix + "1 taskId=" + mTaskInfo1.taskId
		+ " winMode=" + mTaskInfo1.getWindowingMode());
		}
		if (mTaskInfo2 != null) {
		pw.println(innerPrefix + "2 taskId=" + mTaskInfo2.taskId
		+ " winMode=" + mTaskInfo2.getWindowingMode());
		}
		}

		@Override
		public String toString() {
		return TAG + "#" + getRootTaskId();
		}
		}