Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

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

Change-Id: Ife46ffa1d475362df4a418a093fb8eab1cef9192
This commit is contained in:
Ben Lin
2021-05-17 18:06:42 +00:00
committed by Automerger Merge Worker
parent beadf97ace 4e04b705e3
commit 8b8a909722
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -27,6 +27,7 @@ public class PipPinchResizingAlgorithm {
private static final int PINCH_RESIZE_MAX_ANGLE_ROTATION = 45; private static final int PINCH_RESIZE_MAX_ANGLE_ROTATION = 45;
private static final float OVERROTATE_DAMP_FACTOR = 0.4f; private static final float OVERROTATE_DAMP_FACTOR = 0.4f;
private static final float ANGLE_THRESHOLD = 5f; 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 mTmpDownVector = new PointF();
private final PointF mTmpLastVector = new PointF(); private final PointF mTmpLastVector = new PointF();
@@ -46,7 +47,10 @@ public class PipPinchResizingAlgorithm {
lastSecondPoint.y - lastPoint.y); lastSecondPoint.y - lastPoint.y);
float minScale = getMinScale(initialBounds, minSize); float minScale = getMinScale(initialBounds, minSize);
float maxScale = getMaxScale(initialBounds, maxSize); 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 // Scale the bounds by the change in distance between the points
resizeBoundsOut.set(initialBounds); resizeBoundsOut.set(initialBounds);