Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ab392150 authored by Hongwei Wang's avatar Hongwei Wang
Browse files

Polish enter PiP animation on back pressed 

The PipTransitionAnimation#ofBounds is used when entering PiP on back pressed.
- Adjust the scale based on current animation progress
- Alter the auto-enter-pip animation running in Launcher to use the same
  mechanism
- Update the ofBounds animation to ignore small source rect hint,
  similar to what's in auto-enter-pip animation running in Launcher

Video: http://recall/-/aaaaaabFQoRHlzixHdtY/dv35ov6nK2Mrr98DGkLNaE
Video: http://recall/-/aaaaaabFQoRHlzixHdtY/gm8Kl7N3NPIoWoDKyDfd5s
Bug: 235268241
Test: Verify enter PiP animation on back pressed with YouTube in \
      both folded and unfolded state. See also videos.
Change-Id: I6043cff31eed7b63087ea03b17ced7549c89e4fb
parent 6ad1f71c

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

+1 −1
Original line number Diff line number Diff line
@@ -591,7 +591,7 @@ public class PipAnimationController { 
                        final Rect insets = computeInsets(fraction);

                        getSurfaceTransactionHelper().scaleAndCrop(tx, leash,

                                sourceHintRect, initialSourceValue, bounds, insets,

                                isInPipDirection);

                                isInPipDirection, fraction);

                        if (shouldApplyCornerRadius()) {

                            final Rect sourceBounds = new Rect(initialContainerRect);

                            sourceBounds.inset(insets);

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

+6 −2
Original line number Diff line number Diff line
@@ -104,7 +104,7 @@ public class PipSurfaceTransactionHelper { 
    public PipSurfaceTransactionHelper scaleAndCrop(SurfaceControl.Transaction tx,

            SurfaceControl leash, Rect sourceRectHint,

            Rect sourceBounds, Rect destinationBounds, Rect insets,

            boolean isInPipDirection) {

            boolean isInPipDirection, float fraction) {

        mTmpDestinationRect.set(sourceBounds);

        // Similar to {@link #scale}, we want to position the surface relative to the screen

        // coordinates so offset the bounds to 0,0
@@ -116,9 +116,13 @@ public class PipSurfaceTransactionHelper { 
        if (isInPipDirection

                && sourceRectHint != null && sourceRectHint.width() < sourceBounds.width()) {

            // scale by sourceRectHint if it's not edge-to-edge, for entering PiP transition only.

            scale = sourceBounds.width() <= sourceBounds.height()

            final float endScale = sourceBounds.width() <= sourceBounds.height()

                    ? (float) destinationBounds.width() / sourceRectHint.width()

                    : (float) destinationBounds.height() / sourceRectHint.height();

            final float startScale = sourceBounds.width() <= sourceBounds.height()

                    ? (float) destinationBounds.width() / sourceBounds.width()

                    : (float) destinationBounds.height() / sourceBounds.height();

            scale = (1 - fraction) * startScale + fraction * endScale;

        } else {

            scale = sourceBounds.width() <= sourceBounds.height()

                    ? (float) destinationBounds.width() / sourceBounds.width()

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

+19 −0
Original line number Diff line number Diff line
@@ -1472,6 +1472,11 @@ public class PipTaskOrganizer implements ShellTaskOrganizer.TaskListener, 
                    "%s: Abort animation, invalid leash", TAG);

            return null;

        }

        if (isInPipDirection(direction)

                && !isSourceRectHintValidForEnterPip(sourceHintRect, destinationBounds)) {

            // The given source rect hint is too small for enter PiP animation, reset it to null.

            sourceHintRect = null;

        }

        final int rotationDelta = mWaitForFixedRotation

                ? deltaRotation(mCurrentRotation, mNextRotation)

                : Surface.ROTATION_0;
@@ -1545,6 +1550,20 @@ public class PipTaskOrganizer implements ShellTaskOrganizer.TaskListener, 
        return sourceHintRect;

    }



    /**

     * This is a situation in which the source rect hint on at least one axis is smaller

     * than the destination bounds, which represents a problem because we would have to scale

     * up that axis to fit the bounds. So instead, just fallback to the non-source hint

     * animation in this case.

     *

     * @return {@code false} if the given source is too small to use for the entering animation.

     */

    private boolean isSourceRectHintValidForEnterPip(Rect sourceRectHint, Rect destinationBounds) {

        return sourceRectHint != null

                && sourceRectHint.width() > destinationBounds.width()

                && sourceRectHint.height() > destinationBounds.height();

    }



    /**

     * Sync with {@link SplitScreenController} on destination bounds if PiP is going to

     * split screen.

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

+7 −2
Original line number Diff line number Diff line
@@ -80,7 +80,8 @@ public class PipSurfaceTransactionHelper { 


    public PictureInPictureSurfaceTransaction scaleAndCrop(

            SurfaceControl.Transaction tx, SurfaceControl leash,

            Rect sourceRectHint, Rect sourceBounds, Rect destinationBounds, Rect insets) {

            Rect sourceRectHint, Rect sourceBounds, Rect destinationBounds, Rect insets,

            float progress) {

        mTmpSourceRectF.set(sourceBounds);

        mTmpDestinationRect.set(sourceBounds);

        mTmpDestinationRect.inset(insets);
@@ -93,9 +94,13 @@ public class PipSurfaceTransactionHelper { 
                    : (float) destinationBounds.height() / sourceBounds.height();

        } else {

            // scale by sourceRectHint if it's not edge-to-edge

            scale = sourceRectHint.width() <= sourceRectHint.height()

            final float endScale = sourceRectHint.width() <= sourceRectHint.height()

                    ? (float) destinationBounds.width() / sourceRectHint.width()

                    : (float) destinationBounds.height() / sourceRectHint.height();

            final float startScale = sourceRectHint.width() <= sourceRectHint.height()

                    ? (float) destinationBounds.width() / sourceBounds.width()

                    : (float) destinationBounds.height() / sourceBounds.height();

            scale = (1 - progress) * startScale + progress * endScale;

        }

        final float left = destinationBounds.left - (insets.left + sourceBounds.left) * scale;

        final float top = destinationBounds.top - (insets.top + sourceBounds.top) * scale;