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

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

Merge "PiP: Pinch-resize auto to max size if it's pretty close to it." into sc-dev am: 563727df 

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I9c1cc573cb8209fb012fc5fc196003870f9ebdba
parents d87894df 563727df

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

+6 −0
Original line number Diff line number Diff line
@@ -64,6 +64,7 @@ public class PipResizeGestureHandler { 
    private static final String TAG = "PipResizeGestureHandler";

    private static final int PINCH_RESIZE_SNAP_DURATION = 250;

    private static final int PINCH_RESIZE_MAX_ANGLE_ROTATION = 45;

    private static final float PINCH_RESIZE_AUTO_MAX_RATIO = 0.9f;



    private final Context mContext;

    private final PipBoundsAlgorithm mPipBoundsAlgorithm;
@@ -539,6 +540,11 @@ public class PipResizeGestureHandler { 
            // position correctly. Drag-resize does not need to move, so just finalize resize.

            if (mUsingPinchToZoom) {

                final Rect startBounds = new Rect(mLastResizeBounds);

                // If user resize is pretty close to max size, just auto resize to max.

                if (mLastResizeBounds.width() >= PINCH_RESIZE_AUTO_MAX_RATIO * mMaxSize.x

                        || mLastResizeBounds.height() >= PINCH_RESIZE_AUTO_MAX_RATIO * mMaxSize.y) {

                    mLastResizeBounds.set(0, 0, mMaxSize.x, mMaxSize.y);

                }

                mPipBoundsAlgorithm.applySnapFraction(mLastResizeBounds,

                        mPipBoundsAlgorithm.getSnapFraction(mPipBoundsState.getBounds()));

                mPipTaskOrganizer.scheduleAnimateResizePip(startBounds, mLastResizeBounds,