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

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

Merge "PiP: Damp resizing after going over max size." into sc-dev am: 4e04b705 am: 8b8a9097 

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

Change-Id: I120aac6789755b7b99c50e5f18612298a5ccd1f9
parents 28058b47 8b8a9097

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

+5 −1
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ public class PipPinchResizingAlgorithm { 
    private static final int PINCH_RESIZE_MAX_ANGLE_ROTATION = 45;

    private static final float OVERROTATE_DAMP_FACTOR = 0.4f;

    private static final float ANGLE_THRESHOLD = 5f;

    private static final float OVERRESIZE_DAMP_FACTOR = 0.25f;



    private final PointF mTmpDownVector = new PointF();

    private final PointF mTmpLastVector = new PointF();
@@ -46,7 +47,10 @@ public class PipPinchResizingAlgorithm { 
                lastSecondPoint.y - lastPoint.y);

        float minScale = getMinScale(initialBounds, minSize);

        float maxScale = getMaxScale(initialBounds, maxSize);

        float scale = Math.max(minScale, Math.min(maxScale, dist / downDist));

        float overStretchMin = minScale - dist / downDist > 0 ? minScale - dist / downDist : 0;

        float overStretchMax = dist / downDist - maxScale > 0 ? dist / downDist - maxScale : 0;

        float scale = Math.max(minScale - overStretchMin * OVERRESIZE_DAMP_FACTOR,

                Math.min(maxScale + overStretchMax * OVERRESIZE_DAMP_FACTOR, dist / downDist));



        // Scale the bounds by the change in distance between the points

        resizeBoundsOut.set(initialBounds);