Merge "[PiP2] Only accept aspect ratio change if present" into main (4fefcc1a) · Commits · e / os / android_frameworks_base

libs/WindowManager/Shell/src/com/android/wm/shell/pip2/phone/PipTaskListener.java

+3 −1

Original line number	Diff line number	Diff line
		@@ -133,7 +133,9 @@ public class PipTaskListener implements ShellTaskOrganizer.TaskListener,
		taskInfo.topActivity, mPipTransitionState, mPictureInPictureParams, params);
		setPictureInPictureParams(params);
		float newAspectRatio = mPictureInPictureParams.getAspectRatioFloat();
		if (PipUtils.aspectRatioChanged(newAspectRatio, mPipBoundsState.getAspectRatio())) {
		if (params.hasSetAspectRatio()
		&& mPipBoundsAlgorithm.isValidPictureInPictureAspectRatio(newAspectRatio)
		&& PipUtils.aspectRatioChanged(newAspectRatio, mPipBoundsState.getAspectRatio())) {
		mPipTransitionState.setOnIdlePipTransitionStateRunnable(() -> {
		onAspectRatioChanged(newAspectRatio);
		});

libs/WindowManager/Shell/src/com/android/wm/shell/pip2/phone/PipTransition.java

+25 −3

Original line number	Diff line number	Diff line
		@@ -725,6 +725,12 @@ public class PipTransition extends PipTransitionController implements
		mPipTransitionState.getPipTaskToken());
		mFinishCallback = finishCallback;

		if (isPipClosing(info)) {
		// If PiP is removed via a close (e.g. finishing of the activity), then
		// clear out the PiP cache related to that activity component (e.g. reentry state).
		mPipBoundsState.setLastPipComponentName(null /* lastPipComponentName */);
		}

		finishTransaction.setAlpha(pipChange.getLeash(), 0f);
		if (mPendingRemoveWithFadeout) {
		PipAlphaAnimator animator = new PipAlphaAnimator(mContext, pipChange.getLeash(),
		@@ -952,13 +958,29 @@ public class PipTransition extends PipTransitionController implements

		boolean isPipMovedToBack = info.getType() == TRANSIT_TO_BACK
		&& pipChange.getMode() == TRANSIT_TO_BACK;
		boolean isPipClosed = info.getType() == TRANSIT_CLOSE
		&& pipChange.getMode() == TRANSIT_CLOSE;
		// If PiP is dismissed by user (i.e. via dismiss button in PiP menu)
		boolean isPipDismissed = info.getType() == TRANSIT_REMOVE_PIP
		&& pipChange.getMode() == TRANSIT_TO_BACK;
		// PiP is being removed if the pinned task is either moved to back, closed, or dismissed.
		return isPipMovedToBack \|\| isPipClosed \|\| isPipDismissed;
		return isPipMovedToBack \|\| isPipClosing(info) \|\| isPipDismissed;
		}

		private boolean isPipClosing(@NonNull TransitionInfo info) {
		if (mPipTransitionState.getPipTaskToken() == null) {
		// PiP removal makes sense if enter-PiP has cached a valid pinned task token.
		return false;
		}
		TransitionInfo.Change pipChange = info.getChange(mPipTransitionState.getPipTaskToken());
		TransitionInfo.Change pipActivityChange = info.getChanges().stream().filter(change ->
		change.getTaskInfo() == null && change.getParent() != null
		&& change.getParent() == mPipTransitionState.getPipTaskToken())
		.findFirst().orElse(null);

		boolean isPipTaskClosed = pipChange != null
		&& pipChange.getMode() == TRANSIT_CLOSE;
		boolean isPipActivityClosed = pipActivityChange != null
		&& pipActivityChange.getMode() == TRANSIT_CLOSE;
		return isPipTaskClosed \|\| isPipActivityClosed;
		}

		private void prepareConfigAtEndActivity(@NonNull SurfaceControl.Transaction startTx,

libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/pip2/phone/PipTaskListenerTest.java

+30 −0

Original line number	Diff line number	Diff line
		@@ -22,6 +22,7 @@ import static org.junit.Assert.assertEquals;
		import static org.junit.Assert.assertTrue;
		import static org.mockito.ArgumentMatchers.any;
		import static org.mockito.ArgumentMatchers.anyBoolean;
		import static org.mockito.ArgumentMatchers.anyFloat;
		import static org.mockito.ArgumentMatchers.anyInt;
		import static org.mockito.Mockito.when;
		import static org.mockito.kotlin.MatchersKt.eq;
		@@ -193,6 +194,12 @@ public class PipTaskListenerTest {
		mMockPipTransitionState, mMockPipScheduler, mMockPipBoundsState,
		mMockPipBoundsAlgorithm, mMockShellExecutor);
		mPipTaskListener.addParamsChangedListener(mMockPipParamsChangedCallback);

		// For this test case, any aspect ratio passed is considered within allowed range.
		when(mMockPipBoundsAlgorithm
		.isValidPictureInPictureAspectRatio(anyFloat()))
		.thenReturn(true);

		Rational aspectRatio = new Rational(4, 3);
		when(mMockPipBoundsState.getAspectRatio()).thenReturn(aspectRatio.toFloat());
		String action1 = "action1";
		@@ -226,6 +233,29 @@ public class PipTaskListenerTest {
		.setOnIdlePipTransitionStateRunnable(any(Runnable.class));
		}

		@Test
		public void onTaskInfoChanged_nonValidAspectRatio_doesNotCallbackAspectRatioChanged() {
		mPipTaskListener = new PipTaskListener(mMockContext, mMockShellTaskOrganizer,
		mMockPipTransitionState, mMockPipScheduler, mMockPipBoundsState,
		mMockPipBoundsAlgorithm, mMockShellExecutor);
		mPipTaskListener.addParamsChangedListener(mMockPipParamsChangedCallback);

		String action1 = "action1";
		mPipTaskListener.onTaskInfoChanged(getTaskInfo(null, action1));
		verify(mMockPipTransitionState, times(0))
		.setOnIdlePipTransitionStateRunnable(any(Runnable.class));

		// Define an invalid aspect ratio and try and update the params with it.
		Rational aspectRatio = new Rational(100, 3);
		when(mMockPipBoundsAlgorithm
		.isValidPictureInPictureAspectRatio(eq(aspectRatio.floatValue())))
		.thenReturn(false);

		mPipTaskListener.onTaskInfoChanged(getTaskInfo(aspectRatio, action1));
		verify(mMockPipTransitionState, times(0))
		.setOnIdlePipTransitionStateRunnable(any(Runnable.class));
		}

		@Test
		public void onPipTransitionStateChanged_scheduledBoundsChangeWithAspectRatioChange_schedule() {
		mPipTaskListener = new PipTaskListener(mMockContext, mMockShellTaskOrganizer,