Merge "Revert "Fix pip enter/expand from split-screen secondary."" into rvc-dev am: 5e980bfd8b (7f158ffe) · Commits · e / os / android_frameworks_base

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

+0 −3

Original line number	Diff line number	Diff line
		@@ -552,9 +552,6 @@ public class PipTaskOrganizer extends TaskOrganizer {
		? null : destinationBounds;
		// As for the final windowing mode, simply reset it to undefined.
		wct.setWindowingMode(mToken, WINDOWING_MODE_UNDEFINED);
		if (mSplitDivider != null && direction == TRANSITION_DIRECTION_TO_SPLIT_SCREEN) {
		wct.reparent(mToken, mSplitDivider.getSecondaryRoot(), true /* onTop */);
		}
		} else {
		taskBounds = destinationBounds;
		}

+0 −8

Original line number	Diff line number	Diff line
		@@ -813,12 +813,4 @@ public class Divider extends SystemUI implements DividerView.DividerCallbacks,
		updateVisibility(true /* visible */);
		}
		}

		/** @return the container token for the secondary split root task. */
		public WindowContainerToken getSecondaryRoot() {
		if (mSplits == null \|\| mSplits.mSecondary == null) {
		return null;
		}
		return mSplits.mSecondary.token;
		}
		}

+7 −1

Original line number	Diff line number	Diff line
		@@ -1287,6 +1287,12 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A
		}

		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);
		@@ -7771,6 +7777,6 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A

		void setPictureInPictureParams(PictureInPictureParams p) {
		pictureInPictureArgs.copyOnlySet(p);
		getTask().getRootTask().onPictureInPictureParamsChanged();
		getTask().getRootTask().setPictureInPictureParams(p);
		}
		}

+2 −4

Original line number	Diff line number	Diff line
		@@ -702,10 +702,8 @@ class ActivityStack extends Task {
		// Need to make sure windowing mode is supported. If we in the process of creating the stack
		// no need to resolve the windowing mode again as it is already resolved to the right mode.
		if (!creating) {
		if (!taskDisplayArea.isValidWindowingMode(windowingMode, null /* ActivityRecord */,
		topTask, getActivityType())) {
		windowingMode = WINDOWING_MODE_UNDEFINED;
		}
		windowingMode = taskDisplayArea.validateWindowingMode(windowingMode,
		null /* ActivityRecord */, topTask, getActivityType());
		}
		if (taskDisplayArea.getRootSplitScreenPrimaryTask() == this
		&& windowingMode == WINDOWING_MODE_SPLIT_SCREEN_SECONDARY) {

+0 −1

Original line number	Diff line number	Diff line
		@@ -1440,7 +1440,6 @@ public class ActivityStackSupervisor implements RecentTasks.Callbacks {
		mService.deferWindowLayout();
		try {
		stack.setWindowingMode(WINDOWING_MODE_UNDEFINED);
		stack.setBounds(null);
		if (toDisplay.getDisplayId() != stack.getDisplayId()) {
		stack.reparent(toDisplay.getDefaultTaskDisplayArea(), false /* onTop */);
		} else {