From f45228ff1d91e019f2ae01a04fa2eaf04bd08abc Mon Sep 17 00:00:00 2001 From: Ben Lin Date: Wed, 10 Feb 2021 16:18:04 -0800 Subject: PiP: Snap to closest edge when releasing during a pinch-resize. Bug: 178881304 Test: Manual Change-Id: Ibbc1c5bebe2e742fe55bbad44f9b2a9b530b71c7 --- .../src/com/android/wm/shell/pip/phone/PipResizeGestureHandler.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/pip/phone/PipResizeGestureHandler.java b/libs/WindowManager/Shell/src/com/android/wm/shell/pip/phone/PipResizeGestureHandler.java index 53571ff70c6f..1ef9ffa494f4 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/pip/phone/PipResizeGestureHandler.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/pip/phone/PipResizeGestureHandler.java @@ -558,8 +558,8 @@ public class PipResizeGestureHandler { || mLastResizeBounds.height() >= PINCH_RESIZE_AUTO_MAX_RATIO * mMaxSize.y) { mLastResizeBounds.set(0, 0, mMaxSize.x, mMaxSize.y); } - mPipBoundsAlgorithm.applySnapFraction(mLastResizeBounds, - mPipBoundsAlgorithm.getSnapFraction(mPipBoundsState.getBounds())); + final float snapFraction = mPipBoundsAlgorithm.getSnapFraction(mLastResizeBounds); + mPipBoundsAlgorithm.applySnapFraction(mLastResizeBounds, snapFraction); mPipTaskOrganizer.scheduleAnimateResizePip(startBounds, mLastResizeBounds, PINCH_RESIZE_SNAP_DURATION, -mAngle, callback); } else { -- cgit v1.2.3-59-g8ed1b