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

Commit 3407fca0 authored by Hongwei Wang's avatar Hongwei Wang Committed by Automerger Merge Worker
Browse files

Merge "Fix the scale for entering PiP animation" into tm-qpr-dev am: 571b988b am: fc1b9786 

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



Change-Id: I84bf0a745900146783fccd580402d0eb32e65c1a
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 0e641876 fc1b9786

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

+4 −5
Original line number Diff line number Diff line
@@ -115,8 +115,8 @@ public class PipSurfaceTransactionHelper { 
        // coordinates so offset the bounds to 0,0

        mTmpDestinationRect.offsetTo(0, 0);

        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

        // Scale to the bounds no smaller than the destination 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;

        if (isInPipDirection

                && sourceRectHint != null && sourceRectHint.width() < sourceBounds.width()) {
@@ -129,9 +129,8 @@ public class PipSurfaceTransactionHelper { 
                    : (float) destinationBounds.height() / sourceBounds.height();

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

        } else {

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

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

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

            scale = Math.max((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;

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

+4 −5
Original line number Diff line number Diff line
@@ -85,13 +85,12 @@ public class PipSurfaceTransactionHelper { 
        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

        // Scale to the bounds no smaller than the destination 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;

        if (sourceRectHint.isEmpty() || sourceRectHint.width() == sourceBounds.width()) {

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

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

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

            scale = Math.max((float) destinationBounds.width() / sourceBounds.width(),

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

        } else {

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

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