Merge "Reset override bounds when animating to fullscreen" into rvc-dev am: faf6a4d92f (51a16212) · Commits · e / os / android_frameworks_base

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

+7 −2

Original line number	Diff line number	Diff line
		@@ -415,11 +415,16 @@ public class PipTaskOrganizer extends ITaskOrganizer.Stub {
		}
		mLastReportedBounds.set(destinationBounds);
		try {
		// If we are animating to fullscreen, then we need to reset the override bounds on the
		// task to ensure that the task "matches" the parent's bounds
		Rect taskBounds = direction == TRANSITION_DIRECTION_TO_FULLSCREEN
		? null
		: destinationBounds;
		final WindowContainerTransaction wct = new WindowContainerTransaction();
		if (direction == TRANSITION_DIRECTION_TO_PIP) {
		wct.scheduleFinishEnterPip(mToken, destinationBounds);
		wct.scheduleFinishEnterPip(mToken, taskBounds);
		} else {
		wct.setBounds(mToken, destinationBounds);
		wct.setBounds(mToken, taskBounds);
		}
		wct.setBoundsChangeTransaction(mToken, tx);
		mTaskOrganizerController.applyContainerTransaction(wct, null /* ITaskOrganizer */);

+1 −3

Original line number	Diff line number	Diff line
		@@ -2224,9 +2224,7 @@ class DisplayContent extends WindowContainer<DisplayContent.DisplayChildWindowCo
		.addTaggedData(MetricsEvent.FIELD_DISPLAY_ID, getDisplayId()));
		}

		// If there was no pinned stack, we still need to notify the controller of the display info
		// update as a result of the config change.
		if (mPinnedStackControllerLocked != null && !hasPinnedTask()) {
		if (mPinnedStackControllerLocked != null) {
		mPinnedStackControllerLocked.onDisplayInfoChanged(getDisplayInfo());
		}
		}