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

Commit 28058b47 authored by Ben Lin's avatar Ben Lin Committed by Automerger Merge Worker
Browse files

Merge "PiP: Use vertical/horizontal padding base on PiP orientation." into... 

Merge "PiP: Use vertical/horizontal padding base on PiP orientation." into sc-dev am: 54441572 am: beadf97a

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

Change-Id: I2e55904c65cd82ce1cb33f0672a128ea8dfd044e
parents 7e7c892b beadf97a

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

+6 −3
Original line number Diff line number Diff line
@@ -472,17 +472,20 @@ public class PipTouchHandler { 
            float aspectRatio) {

        final int shorterLength = Math.min(mPipBoundsState.getDisplayBounds().width(),

                mPipBoundsState.getDisplayBounds().height());

        final int totalPadding = insetBounds.left * 2;

        final int totalHorizontalPadding = insetBounds.left

                + (mPipBoundsState.getDisplayBounds().width() - insetBounds.right);

        final int totalVerticalPadding = insetBounds.top

                + (mPipBoundsState.getDisplayBounds().height() - insetBounds.bottom);

        final int minWidth, minHeight, maxWidth, maxHeight;

        if (aspectRatio > 1f) {

            minWidth = (int) Math.min(normalBounds.width(), shorterLength * MINIMUM_SIZE_PERCENT);

            minHeight = (int) (minWidth / aspectRatio);

            maxWidth = (int) Math.max(normalBounds.width(), shorterLength - totalPadding);

            maxWidth = (int) Math.max(normalBounds.width(), shorterLength - totalHorizontalPadding);

            maxHeight = (int) (maxWidth / aspectRatio);

        } else {

            minHeight = (int) Math.min(normalBounds.height(), shorterLength * MINIMUM_SIZE_PERCENT);

            minWidth = (int) (minHeight * aspectRatio);

            maxHeight = (int) Math.max(normalBounds.height(), shorterLength - totalPadding);

            maxHeight = (int) Math.max(normalBounds.height(), shorterLength - totalVerticalPadding);

            maxWidth = (int) (maxHeight * aspectRatio);

        }