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

Commit 655ce66b authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Scale PiP to stack instead of crop."

parents 0c430fa4 fd4c9891

services/core/java/com/android/server/wm/TaskStack.java

+1 −1
Original line number Original line Diff line number Diff line
@@ -1479,7 +1479,7 @@ public class TaskStack extends WindowContainer<Task> implements DimLayer.DimLaye 
        return StackId.hasMovementAnimations(mStackId);

        return StackId.hasMovementAnimations(mStackId);

    }

    }





    public boolean getForceScaleToCrop() {

    public boolean getForceScaleToStack() {

        return mBoundsAnimating;

        return mBoundsAnimating;

    }

    }

services/core/java/com/android/server/wm/WindowStateAnimator.java

+6 −4
Original line number Original line Diff line number Diff line
@@ -1313,18 +1313,20 @@ class WindowStateAnimator { 
        float surfaceWidth = mSurfaceController.getWidth();

        float surfaceWidth = mSurfaceController.getWidth();

        float surfaceHeight = mSurfaceController.getHeight();

        float surfaceHeight = mSurfaceController.getHeight();





        if ((task != null && task.mStack.getForceScaleToCrop()) || mForceScaleUntilResize) {

        if ((task != null && task.mStack.getForceScaleToStack()) || mForceScaleUntilResize) {

            int hInsets = w.getAttrs().surfaceInsets.left + w.getAttrs().surfaceInsets.right;

            int hInsets = w.getAttrs().surfaceInsets.left + w.getAttrs().surfaceInsets.right;

            int vInsets = w.getAttrs().surfaceInsets.top + w.getAttrs().surfaceInsets.bottom;

            int vInsets = w.getAttrs().surfaceInsets.top + w.getAttrs().surfaceInsets.bottom;

            if (!mForceScaleUntilResize) {

            if (!mForceScaleUntilResize) {

                mSurfaceController.forceScaleableInTransaction(true);

                mSurfaceController.forceScaleableInTransaction(true);

            }

            }



            task.mStack.getDimBounds(mTmpStackBounds);

            // We want to calculate the scaling based on the content area, not based on

            // We want to calculate the scaling based on the content area, not based on

            // the entire surface, so that we scale in sync with windows that don't have insets.

            // the entire surface, so that we scale in sync with windows that don't have insets.

            mExtraHScale = (finalClipRect.width() - hInsets) / (float)(surfaceWidth - hInsets);

            mExtraHScale = (mTmpStackBounds.width() - hInsets) / (float)(surfaceWidth - hInsets);

            mExtraVScale = (finalClipRect.height() - vInsets) / (float)(surfaceHeight - vInsets);

            mExtraVScale = (mTmpStackBounds.height() - vInsets) / (float)(surfaceHeight - vInsets);





            // In the case of ForceScaleToCrop we scale entire tasks together,

            // In the case of ForceScaleToStack we scale entire tasks together,

            // and so we need to scale our offsets relative to the task bounds

            // and so we need to scale our offsets relative to the task bounds

            // or parent and child windows would fall out of alignment.

            // or parent and child windows would fall out of alignment.

            int posX = (int) (mTmpSize.left - w.mAttrs.x * (1 - mExtraHScale));

            int posX = (int) (mTmpSize.left - w.mAttrs.x * (1 - mExtraHScale));