Merge "Ensure TaskOrganizer works for newly created pinned stack" into rvc-dev am: aaa747d223 (9a022dc6) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/pip/PipTaskOrganizer.java

+9 −4

Original line number	Diff line number	Diff line
		@@ -126,7 +126,7 @@ public class PipTaskOrganizer extends TaskOrganizer {
		};

		@SuppressWarnings("unchecked")
		private Handler.Callback mUpdateCallbacks = (msg) -> {
		private final Handler.Callback mUpdateCallbacks = (msg) -> {
		SomeArgs args = (SomeArgs) msg.obj;
		Consumer<Rect> updateBoundsCallback = (Consumer<Rect>) args.arg1;
		switch (msg.what) {
		@@ -282,7 +282,7 @@ public class PipTaskOrganizer extends TaskOrganizer {
		*/
		@Override
		public void onTaskVanished(ActivityManager.RunningTaskInfo info) {
		WindowContainerToken token = info.token;
		final WindowContainerToken token = info.token;
		Objects.requireNonNull(token, "Requires valid WindowContainerToken");
		if (token.asBinder() != mToken.asBinder()) {
		Log.wtf(TAG, "Unrecognized token: " + token);
		@@ -297,6 +297,7 @@ public class PipTaskOrganizer extends TaskOrganizer {

		@Override
		public void onTaskInfoChanged(ActivityManager.RunningTaskInfo info) {
		Objects.requireNonNull(mToken, "onTaskInfoChanged requires valid existing mToken");
		final PictureInPictureParams newParams = info.pictureInPictureParams;
		if (!shouldUpdateDestinationBounds(newParams)) {
		Log.d(TAG, "Ignored onTaskInfoChanged with PiP param: " + newParams);
		@@ -375,7 +376,7 @@ public class PipTaskOrganizer extends TaskOrganizer {
		@PipAnimationController.TransitionDirection int direction, int durationMs,
		Consumer<Rect> updateBoundsCallback) {
		if (!mInPip) {
		// Ignore animation when we are no longer in PIP
		// can be initiated in other component, ignore if we are no longer in PIP
		return;
		}
		SomeArgs args = SomeArgs.obtain();
		@@ -427,6 +428,10 @@ public class PipTaskOrganizer extends TaskOrganizer {
		private void scheduleFinishResizePip(SurfaceControl.Transaction tx,
		Rect destinationBounds, @PipAnimationController.TransitionDirection int direction,
		Consumer<Rect> updateBoundsCallback) {
		if (!mInPip) {
		// can be initiated in other component, ignore if we are no longer in PIP
		return;
		}
		SomeArgs args = SomeArgs.obtain();
		args.arg1 = updateBoundsCallback;
		args.arg2 = tx;
		@@ -441,7 +446,7 @@ public class PipTaskOrganizer extends TaskOrganizer {
		public void scheduleOffsetPip(Rect originalBounds, int offset, int duration,
		Consumer<Rect> updateBoundsCallback) {
		if (!mInPip) {
		// Ignore offsets when we are no longer in PIP
		// can be initiated in other component, ignore if we are no longer in PIP
		return;
		}
		SomeArgs args = SomeArgs.obtain();

services/core/java/com/android/server/wm/ActivityRecord.java

+13 −0

Original line number	Diff line number	Diff line
		@@ -1298,6 +1298,19 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A
		if (newTask != null && isState(RESUMED)) {
		newTask.setResumedActivity(this, "onParentChanged");
		}

		if (stack != null && stack.topRunningActivity() == this) {
		// carry over the PictureInPictureParams to the parent stack without calling
		// TaskOrganizerController#dispatchTaskInfoChanged.
		// this is to ensure the stack holding up-to-dated pinned stack information
		// when activity is re-parented to enter pip mode, see also
		// RootWindowContainer#moveActivityToPinnedStack
		stack.mPictureInPictureParams.copyOnlySet(pictureInPictureArgs);
		// make ensure the TaskOrganizer still works after re-parenting
		if (firstWindowDrawn) {
		stack.setHasBeenVisible(true);
		}
		}
		}

		private void updateColorTransform() {

services/core/java/com/android/server/wm/ActivityTaskManagerService.java

+1 −4

Original line number	Diff line number	Diff line
		@@ -4093,11 +4093,8 @@ public class ActivityTaskManagerService extends IActivityTaskManager.Stub {
		r.setPictureInPictureParams(params);
		final float aspectRatio = r.pictureInPictureArgs.getAspectRatio();
		final List<RemoteAction> actions = r.pictureInPictureArgs.getActions();
		// Adjust the source bounds by the insets for the transition down
		final Rect sourceBounds = new Rect(
		r.pictureInPictureArgs.getSourceRectHint());
		mRootWindowContainer.moveActivityToPinnedStack(
		r, sourceBounds, aspectRatio, "enterPictureInPictureMode");
		r, "enterPictureInPictureMode");
		final ActivityStack stack = r.getRootTask();
		stack.setPictureInPictureAspectRatio(aspectRatio);
		stack.setPictureInPictureActions(actions);

services/core/java/com/android/server/wm/RootWindowContainer.java

+7 −7

Original line number	Diff line number	Diff line
		@@ -2147,13 +2147,11 @@ class RootWindowContainer extends WindowContainer<DisplayContent>
		return false;
		}

		moveActivityToPinnedStack(r, null /* sourceBounds /, 0f / aspectRatio */,
		"moveTopActivityToPinnedStack");
		moveActivityToPinnedStack(r, "moveTopActivityToPinnedStack");
		return true;
		}

		void moveActivityToPinnedStack(ActivityRecord r, Rect sourceHintBounds, float aspectRatio,
		String reason) {
		void moveActivityToPinnedStack(ActivityRecord r, String reason) {
		mService.deferWindowLayout();

		final TaskDisplayArea taskDisplayArea = r.getDisplayArea();
		@@ -2176,17 +2174,19 @@ class RootWindowContainer extends WindowContainer<DisplayContent>
		final ActivityStack stack;
		if (singleActivity) {
		stack = r.getRootTask();
		stack.setWindowingMode(WINDOWING_MODE_PINNED);
		} else {
		// In the case of multiple activities, we will create a new task for it and then
		// move the PIP activity into the task.
		stack = taskDisplayArea.createStack(WINDOWING_MODE_PINNED, r.getActivityType(),
		stack = taskDisplayArea.createStack(WINDOWING_MODE_UNDEFINED, r.getActivityType(),
		ON_TOP, r.info, r.intent, false /* createdByOrganizer */);

		// There are multiple activities in the task and moving the top activity should
		// reveal/leave the other activities in their original task.
		r.reparent(stack, MAX_VALUE, "moveActivityToStack");
		// On the other hand, ActivityRecord#onParentChanged takes care of setting the
		// up-to-dated pinned stack information on this newly created stack.
		r.reparent(stack, MAX_VALUE, reason);
		}
		stack.setWindowingMode(WINDOWING_MODE_PINNED);

		// Reset the state that indicates it can enter PiP while pausing after we've moved it
		// to the pinned stack

services/tests/wmtests/src/com/android/server/wm/RootActivityContainerTests.java

+2 −6

Original line number	Diff line number	Diff line
		@@ -58,7 +58,6 @@ import android.content.pm.ActivityInfo;
		import android.content.pm.ApplicationInfo;
		import android.content.pm.ResolveInfo;
		import android.content.res.Resources;
		import android.graphics.Rect;
		import android.platform.test.annotations.Presubmit;
		import android.util.Pair;

		@@ -126,9 +125,7 @@ public class RootActivityContainerTests extends ActivityTestsBase {
		ensureStackPlacement(mFullscreenStack, firstActivity, secondActivity);

		// Move first activity to pinned stack.
		final Rect sourceBounds = new Rect();
		mRootWindowContainer.moveActivityToPinnedStack(firstActivity, sourceBounds,
		0f /aspectRatio/, "initialMove");
		mRootWindowContainer.moveActivityToPinnedStack(firstActivity, "initialMove");

		final TaskDisplayArea taskDisplayArea = mFullscreenStack.getDisplayArea();
		ActivityStack pinnedStack = taskDisplayArea.getRootPinnedTask();
		@@ -137,8 +134,7 @@ public class RootActivityContainerTests extends ActivityTestsBase {
		ensureStackPlacement(mFullscreenStack, secondActivity);

		// Move second activity to pinned stack.
		mRootWindowContainer.moveActivityToPinnedStack(secondActivity, sourceBounds,
		0f /aspectRatio/, "secondMove");
		mRootWindowContainer.moveActivityToPinnedStack(secondActivity, "secondMove");

		// Need to get stacks again as a new instance might have been created.
		pinnedStack = taskDisplayArea.getRootPinnedTask();