Merge "[RESTRICT AUTOMERGE] Ignore small source rect hint" into sc-v2-dev (59eb13f1) · Commits · e / os / android_frameworks_base

libs/WindowManager/Shell/src/com/android/wm/shell/pip/PipBoundsAlgorithm.java

+15 −0

Original line number	Diff line number	Diff line
		@@ -182,6 +182,21 @@ public class PipBoundsAlgorithm {
		return null;
		}

		/**
		* Returns the source hint rect if it is valid (if provided and is contained by the current
		* task bounds and not too small).
		*/
		public static Rect getValidSourceHintRect(PictureInPictureParams params, Rect sourceBounds,
		@NonNull Rect destinationBounds) {
		final Rect sourceHintRect = getValidSourceHintRect(params, sourceBounds);
		if (sourceHintRect != null
		&& sourceHintRect.width() > destinationBounds.width()
		&& sourceHintRect.height() > destinationBounds.height()) {
		return sourceHintRect;
		}
		return null;
		}

		public float getDefaultAspectRatio() {
		return mDefaultAspectRatio;
		}

+3 −3

Original line number	Diff line number	Diff line
		@@ -553,7 +553,7 @@ public class PipTaskOrganizer implements ShellTaskOrganizer.TaskListener,
		if (mOneShotAnimationType == ANIM_TYPE_BOUNDS) {
		mPipMenuController.attach(mLeash);
		final Rect sourceHintRect = PipBoundsAlgorithm.getValidSourceHintRect(
		info.pictureInPictureParams, currentBounds);
		info.pictureInPictureParams, currentBounds, destinationBounds);
		scheduleAnimateResizePip(currentBounds, destinationBounds, 0 /* startingAngle */,
		sourceHintRect, TRANSITION_DIRECTION_TO_PIP, mEnterAnimationDuration,
		null /* updateBoundsCallback */);
		@@ -579,9 +579,9 @@ public class PipTaskOrganizer implements ShellTaskOrganizer.TaskListener,
		return;
		}
		final Rect currentBounds = mTaskInfo.configuration.windowConfiguration.getBounds();
		final Rect sourceHintRect = PipBoundsAlgorithm.getValidSourceHintRect(
		mPictureInPictureParams, currentBounds);
		final Rect destinationBounds = mPipBoundsAlgorithm.getEntryDestinationBounds();
		final Rect sourceHintRect = PipBoundsAlgorithm.getValidSourceHintRect(
		mPictureInPictureParams, currentBounds, destinationBounds);
		animateResizePip(currentBounds, destinationBounds, sourceHintRect,
		TRANSITION_DIRECTION_TO_PIP, mEnterAnimationDuration, 0 /* startingAngle */);
		mPipTransitionState.setTransitionState(PipTransitionState.ENTERING_PIP);

+1 −1

Original line number	Diff line number	Diff line
		@@ -318,7 +318,7 @@ public class PipTransition extends PipTransitionController {
		if (mOneShotAnimationType == ANIM_TYPE_BOUNDS) {
		final Rect sourceHintRect =
		PipBoundsAlgorithm.getValidSourceHintRect(
		taskInfo.pictureInPictureParams, currentBounds);
		taskInfo.pictureInPictureParams, currentBounds, destinationBounds);
		animator = mPipAnimationController.getAnimator(taskInfo, leash, currentBounds,
		currentBounds, destinationBounds, sourceHintRect, TRANSITION_DIRECTION_TO_PIP,
		0 /* startingAngle */, rotationDelta);