From 620ee55cc38d770d8b1de33d4804a08edfcaae31 Mon Sep 17 00:00:00 2001 From: Ben Lin Date: Fri, 7 May 2021 14:23:04 -0700 Subject: [PATCH] PiP: Damp resizing after going over max size. Video: http://recall/-/gu5DjQFZPMFpwgaXdl4cV3/ehwIIonDvQwp5qqdgCtfBO Bug: 187752281 Test: Manual Change-Id: I10422869e2ea566f12782685cc78e0bd547c4007 --- .../wm/shell/pip/phone/PipPinchResizingAlgorithm.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/pip/phone/PipPinchResizingAlgorithm.java b/libs/WindowManager/Shell/src/com/android/wm/shell/pip/phone/PipPinchResizingAlgorithm.java index f8125fd5764e3..23153be728908 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/pip/phone/PipPinchResizingAlgorithm.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/pip/phone/PipPinchResizingAlgorithm.java @@ -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);