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

Commit 56b51d2d authored by Hongwei Wang's avatar Hongwei Wang Committed by Automerger Merge Worker
Browse files

Merge "Polish YT auto enter PiP transition" into sc-dev am: 96300694 am: 286fb4f6 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14941602

Change-Id: I526e7938db7bfcdd957f0f9af12ae358a050f14b
parents 45cb7262 286fb4f6

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

+14 −8
Original line number Diff line number Diff line
@@ -85,9 +85,7 @@ public class PipSurfaceTransactionHelper { 
        final float left = destinationBounds.left - insets.left * scale;

        final float top = destinationBounds.top - insets.top * scale;

        mTmpTransform.setScale(scale, scale);

        final Rect cornerRadiusRect = new Rect(destinationBounds);

        cornerRadiusRect.inset(insets);

        final float cornerRadius = getScaledCornerRadius(sourceBounds, cornerRadiusRect);

        final float cornerRadius = getScaledCornerRadius(mTmpDestinationRect, destinationBounds);

        tx.setMatrix(leash, mTmpTransform, mTmpFloat9)

                .setWindowCrop(leash, mTmpDestinationRect)

                .setPosition(leash, left, top)
@@ -110,15 +108,23 @@ public class PipSurfaceTransactionHelper { 
                : (float) destinationBounds.height() / sourceBounds.height();

        mTmpTransform.setRotate(degree, 0, 0);

        mTmpTransform.postScale(scale, scale);

        final Rect cornerRadiusRect = new Rect(destinationBounds);

        cornerRadiusRect.inset(insets);

        final float cornerRadius = getScaledCornerRadius(sourceBounds, cornerRadiusRect);

        final float cornerRadius = getScaledCornerRadius(mTmpDestinationRect, destinationBounds);

        // adjust the positions, take account also the insets

        final float adjustedPositionX, adjustedPositionY;

        if (degree < 0) {

            adjustedPositionX = positionX + insets.top * scale;

            adjustedPositionY = positionY + insets.left * scale;

        } else {

            adjustedPositionX = positionX - insets.top * scale;

            adjustedPositionY = positionY - insets.left * scale;

        }

        tx.setMatrix(leash, mTmpTransform, mTmpFloat9)

                .setWindowCrop(leash, mTmpDestinationRect)

                .setPosition(leash, positionX, positionY)

                .setPosition(leash, adjustedPositionX, adjustedPositionY)

                .setCornerRadius(leash, cornerRadius);

        return new PictureInPictureSurfaceTransaction(

                positionX, positionY, mTmpFloat9, degree, cornerRadius, mTmpDestinationRect);

                adjustedPositionX, adjustedPositionY,

                mTmpFloat9, degree, cornerRadius, mTmpDestinationRect);

    }



    /** @return the round corner radius scaled by given from and to bounds */