Merge "Revert "Restore support for source hint rect"" into rvc-dev am: 611e7a484a (93828f13) · Commits · e / os / android_frameworks_base

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

+24 −36

Original line number	Diff line number	Diff line
		@@ -17,7 +17,6 @@
		package com.android.systemui.pip;

		import android.animation.Animator;
		import android.animation.RectEvaluator;
		import android.animation.ValueAnimator;
		import android.annotation.IntDef;
		import android.content.Context;
		@@ -27,7 +26,6 @@ import android.view.animation.AnimationUtils;
		import android.view.animation.Interpolator;

		import com.android.internal.annotations.VisibleForTesting;
		import com.android.systemui.Interpolators;

		import java.lang.annotation.Retention;
		import java.lang.annotation.RetentionPolicy;
		@@ -76,12 +74,15 @@ public class PipAnimationController {
		\|\| direction == TRANSITION_DIRECTION_TO_SPLIT_SCREEN;
		}

		private final Interpolator mFastOutSlowInInterpolator;
		private final PipSurfaceTransactionHelper mSurfaceTransactionHelper;

		private PipTransitionAnimator mCurrentAnimator;

		@Inject
		PipAnimationController(Context context, PipSurfaceTransactionHelper helper) {
		mFastOutSlowInInterpolator = AnimationUtils.loadInterpolator(context,
		com.android.internal.R.interpolator.fast_out_slow_in);
		mSurfaceTransactionHelper = helper;
		}

		@@ -103,11 +104,10 @@ public class PipAnimationController {
		}

		@SuppressWarnings("unchecked")
		PipTransitionAnimator getAnimator(SurfaceControl leash, Rect startBounds, Rect endBounds,
		Rect sourceHintRect) {
		PipTransitionAnimator getAnimator(SurfaceControl leash, Rect startBounds, Rect endBounds) {
		if (mCurrentAnimator == null) {
		mCurrentAnimator = setupPipTransitionAnimator(
		PipTransitionAnimator.ofBounds(leash, startBounds, endBounds, sourceHintRect));
		PipTransitionAnimator.ofBounds(leash, startBounds, endBounds));
		} else if (mCurrentAnimator.getAnimationType() == ANIM_TYPE_ALPHA
		&& mCurrentAnimator.isRunning()) {
		// If we are still animating the fade into pip, then just move the surface and ensure
		@@ -122,7 +122,7 @@ public class PipAnimationController {
		} else {
		mCurrentAnimator.cancel();
		mCurrentAnimator = setupPipTransitionAnimator(
		PipTransitionAnimator.ofBounds(leash, startBounds, endBounds, sourceHintRect));
		PipTransitionAnimator.ofBounds(leash, startBounds, endBounds));
		}
		return mCurrentAnimator;
		}
		@@ -133,7 +133,7 @@ public class PipAnimationController {

		private PipTransitionAnimator setupPipTransitionAnimator(PipTransitionAnimator animator) {
		animator.setSurfaceTransactionHelper(mSurfaceTransactionHelper);
		animator.setInterpolator(Interpolators.FAST_OUT_SLOW_IN);
		animator.setInterpolator(mFastOutSlowInInterpolator);
		animator.setFloatValues(FRACTION_START, FRACTION_END);
		return animator;
		}
		@@ -331,7 +331,6 @@ public class PipAnimationController {
		@Override
		void onStartTransaction(SurfaceControl leash, SurfaceControl.Transaction tx) {
		getSurfaceTransactionHelper()
		.resetScale(tx, leash, getDestinationBounds())
		.crop(tx, leash, getDestinationBounds())
		.round(tx, leash, shouldApplyCornerRadius());
		tx.show(leash);
		@@ -347,46 +346,35 @@ public class PipAnimationController {
		}

		static PipTransitionAnimator<Rect> ofBounds(SurfaceControl leash,
		Rect startValue, Rect endValue, Rect sourceHintRect) {
		// Just for simplicity we'll interpolate between the source rect hint insets and empty
		// insets to calculate the window crop
		final Rect initialStartValue = new Rect(startValue);
		final Rect sourceHintRectInsets = sourceHintRect != null
		? new Rect(sourceHintRect.left - startValue.left,
		sourceHintRect.top - startValue.top,
		startValue.right - sourceHintRect.right,
		startValue.bottom - sourceHintRect.bottom)
		: null;
		final Rect sourceInsets = new Rect(0, 0, 0, 0);

		Rect startValue, Rect endValue) {
		// construct new Rect instances in case they are recycled
		return new PipTransitionAnimator<Rect>(leash, ANIM_TYPE_BOUNDS,
		endValue, new Rect(startValue), new Rect(endValue)) {
		private final RectEvaluator mRectEvaluator = new RectEvaluator(new Rect());
		private final RectEvaluator mInsetsEvaluator = new RectEvaluator(new Rect());
		private final Rect mTmpRect = new Rect();

		private int getCastedFractionValue(float start, float end, float fraction) {
		return (int) (start * (1 - fraction) + end * fraction + .5f);
		}

		@Override
		void applySurfaceControlTransaction(SurfaceControl leash,
		SurfaceControl.Transaction tx, float fraction) {
		final Rect start = getStartValue();
		final Rect end = getEndValue();
		Rect bounds = mRectEvaluator.evaluate(fraction, start, end);
		setCurrentValue(bounds);
		mTmpRect.set(
		getCastedFractionValue(start.left, end.left, fraction),
		getCastedFractionValue(start.top, end.top, fraction),
		getCastedFractionValue(start.right, end.right, fraction),
		getCastedFractionValue(start.bottom, end.bottom, fraction));
		setCurrentValue(mTmpRect);
		if (inScaleTransition()) {
		if (isOutPipDirection(getTransitionDirection())) {
		getSurfaceTransactionHelper().scale(tx, leash, end, bounds);
		getSurfaceTransactionHelper().scale(tx, leash, end, mTmpRect);
		} else {
		getSurfaceTransactionHelper().scale(tx, leash, start, bounds);
		getSurfaceTransactionHelper().scale(tx, leash, start, mTmpRect);
		}
		} else {
		if (sourceHintRectInsets != null) {
		Rect insets = mInsetsEvaluator.evaluate(fraction, sourceInsets,
		sourceHintRectInsets);
		getSurfaceTransactionHelper().scaleAndCrop(tx, leash, initialStartValue,
		bounds, insets);
		} else {
		getSurfaceTransactionHelper().scale(tx, leash, start, bounds);
		}
		getSurfaceTransactionHelper().crop(tx, leash, mTmpRect);
		}
		tx.apply();
		}
		@@ -402,11 +390,11 @@ public class PipAnimationController {

		@Override
		void onEndTransaction(SurfaceControl leash, SurfaceControl.Transaction tx) {
		if (!inScaleTransition()) return;
		// NOTE: intentionally does not apply the transaction here.
		// this end transaction should get executed synchronously with the final
		// WindowContainerTransaction in task organizer
		getSurfaceTransactionHelper()
		.resetScale(tx, leash, getDestinationBounds())
		getSurfaceTransactionHelper().resetScale(tx, leash, getDestinationBounds())
		.crop(tx, leash, getDestinationBounds());
		}

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

+7 −8

Original line number	Diff line number	Diff line
		@@ -296,14 +296,6 @@ public class PipBoundsHandler {
		*/
		public boolean onDisplayRotationChanged(Rect outBounds, Rect oldBounds, Rect outInsetBounds,
		int displayId, int fromRotation, int toRotation, WindowContainerTransaction t) {
		// Calculate the snap fraction of the current stack along the old movement bounds
		final Rect postChangeStackBounds = new Rect(oldBounds);
		final float snapFraction = getSnapFraction(postChangeStackBounds);

		// Update the display layout, note that we have to do this on every rotation even if we
		// aren't in PIP since we need to update the display layout to get the right resources
		mDisplayLayout.rotateTo(mContext.getResources(), toRotation);

		// Bail early if the event is not sent to current {@link #mDisplayInfo}
		if ((displayId != mDisplayInfo.displayId) \|\| (fromRotation == toRotation)) {
		return false;
		@@ -320,6 +312,13 @@ public class PipBoundsHandler {
		return false;
		}

		// Calculate the snap fraction of the current stack along the old movement bounds
		final Rect postChangeStackBounds = new Rect(oldBounds);
		final float snapFraction = getSnapFraction(postChangeStackBounds);

		// Update the display layout
		mDisplayLayout.rotateTo(mContext.getResources(), toRotation);

		// Populate the new {@link #mDisplayInfo}.
		// The {@link DisplayInfo} queried from DisplayManager would be the one before rotation,
		// therefore, the width/height may require a swap first.

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

+1 −25

Original line number	Diff line number	Diff line
		@@ -44,7 +44,6 @@ public class PipSurfaceTransactionHelper implements ConfigurationController.Conf
		private final float[] mTmpFloat9 = new float[9];
		private final RectF mTmpSourceRectF = new RectF();
		private final RectF mTmpDestinationRectF = new RectF();
		private final Rect mTmpDestinationRect = new Rect();

		@Inject
		public PipSurfaceTransactionHelper(Context context, ConfigurationController configController) {
		@@ -91,30 +90,7 @@ public class PipSurfaceTransactionHelper implements ConfigurationController.Conf
		mTmpDestinationRectF.set(destinationBounds);
		mTmpTransform.setRectToRect(mTmpSourceRectF, mTmpDestinationRectF, Matrix.ScaleToFit.FILL);
		tx.setMatrix(leash, mTmpTransform, mTmpFloat9)
		.setPosition(leash, mTmpDestinationRectF.left, mTmpDestinationRectF.top);
		return this;
		}

		/**
		* Operates the scale (setMatrix) on a given transaction and leash
		* @return same {@link PipSurfaceTransactionHelper} instance for method chaining
		*/
		PipSurfaceTransactionHelper scaleAndCrop(SurfaceControl.Transaction tx, SurfaceControl leash,
		Rect sourceBounds, Rect destinationBounds, Rect insets) {
		mTmpSourceRectF.set(sourceBounds);
		mTmpDestinationRect.set(sourceBounds);
		mTmpDestinationRect.inset(insets);
		// Scale by the shortest edge and offset such that the top/left of the scaled inset source
		// rect aligns with the top/left of the destination bounds
		final float scale = sourceBounds.width() <= sourceBounds.height()
		? (float) destinationBounds.width() / sourceBounds.width()
		: (float) destinationBounds.height() / sourceBounds.height();
		final float left = destinationBounds.left - insets.left * scale;
		final float top = destinationBounds.top - insets.top * scale;
		mTmpTransform.setScale(scale, scale);
		tx.setMatrix(leash, mTmpTransform, mTmpFloat9)
		.setWindowCrop(leash, mTmpDestinationRect)
		.setPosition(leash, left, top);
		.setPosition(leash, destinationBounds.left, destinationBounds.top);
		return this;
		}

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

+9 −30

Original line number	Diff line number	Diff line
		@@ -143,10 +143,8 @@ public class PipTaskOrganizer extends TaskOrganizer implements
		case MSG_RESIZE_ANIMATE: {
		Rect currentBounds = (Rect) args.arg2;
		Rect toBounds = (Rect) args.arg3;
		Rect sourceHintRect = (Rect) args.arg4;
		int duration = args.argi2;
		animateResizePip(currentBounds, toBounds, sourceHintRect,
		args.argi1 /* direction */, duration);
		animateResizePip(currentBounds, toBounds, args.argi1 /* direction */, duration);
		if (updateBoundsCallback != null) {
		updateBoundsCallback.accept(toBounds);
		}
		@@ -296,8 +294,7 @@ public class PipTaskOrganizer extends TaskOrganizer implements
		public void onTransactionReady(int id, SurfaceControl.Transaction t) {
		t.apply();
		scheduleAnimateResizePip(mLastReportedBounds, destinationBounds,
		null /* sourceHintRect */, direction, animationDurationMs,
		null /* updateBoundsCallback */);
		direction, animationDurationMs, null /* updateBoundsCallback */);
		mInPip = false;
		}
		});
		@@ -360,8 +357,7 @@ public class PipTaskOrganizer extends TaskOrganizer implements
		final Rect currentBounds = mTaskInfo.configuration.windowConfiguration.getBounds();

		if (mOneShotAnimationType == ANIM_TYPE_BOUNDS) {
		final Rect sourceHintRect = getValidSourceHintRect(info, currentBounds);
		scheduleAnimateResizePip(currentBounds, destinationBounds, sourceHintRect,
		scheduleAnimateResizePip(currentBounds, destinationBounds,
		TRANSITION_DIRECTION_TO_PIP, mEnterExitAnimationDuration,
		null /* updateBoundsCallback */);
		} else if (mOneShotAnimationType == ANIM_TYPE_ALPHA) {
		@@ -372,21 +368,6 @@ public class PipTaskOrganizer extends TaskOrganizer implements
		}
		}

		/**
		* Returns the source hint rect if it is valid (if provided and is contained by the current
		* task bounds).
		*/
		private Rect getValidSourceHintRect(ActivityManager.RunningTaskInfo info, Rect sourceBounds) {
		final Rect sourceHintRect = info.pictureInPictureParams != null
		&& info.pictureInPictureParams.hasSourceBoundsHint()
		? info.pictureInPictureParams.getSourceRectHint()
		: null;
		if (sourceHintRect != null && sourceBounds.contains(sourceHintRect)) {
		return sourceHintRect;
		}
		return null;
		}

		private void enterPipWithAlphaAnimation(Rect destinationBounds, long durationMs) {
		// If we are fading the PIP in, then we should move the pip to the final location as
		// soon as possible, but set the alpha immediately since the transaction can take a
		@@ -571,13 +552,13 @@ public class PipTaskOrganizer extends TaskOrganizer implements
		Log.d(TAG, "skip scheduleAnimateResizePip, entering pip deferred");
		return;
		}
		scheduleAnimateResizePip(mLastReportedBounds, toBounds, null /* sourceHintRect */,
		scheduleAnimateResizePip(mLastReportedBounds, toBounds,
		TRANSITION_DIRECTION_NONE, duration, updateBoundsCallback);
		}

		private void scheduleAnimateResizePip(Rect currentBounds, Rect destinationBounds,
		Rect sourceHintRect, @PipAnimationController.TransitionDirection int direction,
		int durationMs, Consumer<Rect> updateBoundsCallback) {
		@PipAnimationController.TransitionDirection int direction, int durationMs,
		Consumer<Rect> updateBoundsCallback) {
		if (!mInPip) {
		// can be initiated in other component, ignore if we are no longer in PIP
		return;
		@@ -587,7 +568,6 @@ public class PipTaskOrganizer extends TaskOrganizer implements
		args.arg1 = updateBoundsCallback;
		args.arg2 = currentBounds;
		args.arg3 = destinationBounds;
		args.arg4 = sourceHintRect;
		args.argi1 = direction;
		args.argi2 = durationMs;
		mUpdateHandler.sendMessage(mUpdateHandler.obtainMessage(MSG_RESIZE_ANIMATE, args));
		@@ -687,8 +667,7 @@ public class PipTaskOrganizer extends TaskOrganizer implements
		}
		final Rect destinationBounds = new Rect(originalBounds);
		destinationBounds.offset(xOffset, yOffset);
		animateResizePip(originalBounds, destinationBounds, null /* sourceHintRect */,
		TRANSITION_DIRECTION_SAME, durationMs);
		animateResizePip(originalBounds, destinationBounds, TRANSITION_DIRECTION_SAME, durationMs);
		}

		private void resizePip(Rect destinationBounds) {
		@@ -766,7 +745,7 @@ public class PipTaskOrganizer extends TaskOrganizer implements
		WindowOrganizer.applyTransaction(wct);
		}

		private void animateResizePip(Rect currentBounds, Rect destinationBounds, Rect sourceHintRect,
		private void animateResizePip(Rect currentBounds, Rect destinationBounds,
		@PipAnimationController.TransitionDirection int direction, int durationMs) {
		if (Looper.myLooper() != mUpdateHandler.getLooper()) {
		throw new RuntimeException("Callers should call scheduleAnimateResizePip() instead of "
		@@ -778,7 +757,7 @@ public class PipTaskOrganizer extends TaskOrganizer implements
		return;
		}
		mPipAnimationController
		.getAnimator(mLeash, currentBounds, destinationBounds, sourceHintRect)
		.getAnimator(mLeash, currentBounds, destinationBounds)
		.setTransitionDirection(direction)
		.setPipAnimationCallback(mPipAnimationCallback)
		.setDuration(durationMs)

packages/SystemUI/tests/src/com/android/systemui/pip/PipAnimationControllerTest.java

+5 −5

Original line number	Diff line number	Diff line
		@@ -82,7 +82,7 @@ public class PipAnimationControllerTest extends SysuiTestCase {
		@Test
		public void getAnimator_withBounds_returnBoundsAnimator() {
		final PipAnimationController.PipTransitionAnimator animator = mPipAnimationController
		.getAnimator(mLeash, new Rect(), new Rect(), null);
		.getAnimator(mLeash, new Rect(), new Rect());

		assertEquals("Expect ANIM_TYPE_BOUNDS animation",
		animator.getAnimationType(), PipAnimationController.ANIM_TYPE_BOUNDS);
		@@ -94,12 +94,12 @@ public class PipAnimationControllerTest extends SysuiTestCase {
		final Rect endValue1 = new Rect(100, 100, 200, 200);
		final Rect endValue2 = new Rect(200, 200, 300, 300);
		final PipAnimationController.PipTransitionAnimator oldAnimator = mPipAnimationController
		.getAnimator(mLeash, startValue, endValue1, null);
		.getAnimator(mLeash, startValue, endValue1);
		oldAnimator.setSurfaceControlTransactionFactory(DummySurfaceControlTx::new);
		oldAnimator.start();

		final PipAnimationController.PipTransitionAnimator newAnimator = mPipAnimationController
		.getAnimator(mLeash, startValue, endValue2, null);
		.getAnimator(mLeash, startValue, endValue2);

		assertEquals("getAnimator with same type returns same animator",
		oldAnimator, newAnimator);
		@@ -129,7 +129,7 @@ public class PipAnimationControllerTest extends SysuiTestCase {
		final Rect endValue1 = new Rect(100, 100, 200, 200);
		final Rect endValue2 = new Rect(200, 200, 300, 300);
		final PipAnimationController.PipTransitionAnimator animator = mPipAnimationController
		.getAnimator(mLeash, startValue, endValue1, null);
		.getAnimator(mLeash, startValue, endValue1);

		animator.updateEndValue(endValue2);

		@@ -141,7 +141,7 @@ public class PipAnimationControllerTest extends SysuiTestCase {
		final Rect startValue = new Rect(0, 0, 100, 100);
		final Rect endValue = new Rect(100, 100, 200, 200);
		final PipAnimationController.PipTransitionAnimator animator = mPipAnimationController
		.getAnimator(mLeash, startValue, endValue, null);
		.getAnimator(mLeash, startValue, endValue);
		animator.setSurfaceControlTransactionFactory(DummySurfaceControlTx::new);

		animator.setPipAnimationCallback(mPipAnimationCallback);