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

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

Merge "PiP: Constrain pinch-resize input to start inside PiP bounds." into... 

Merge "PiP: Constrain pinch-resize input to start inside PiP bounds." into sc-dev am: 750ddcc6 am: 87af7401

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

Change-Id: I12693bd3e06cb633debb2cb482a9a63151a3550a
parents d4aa9273 87af7401

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

+5 −2
Original line number Diff line number Diff line
@@ -383,14 +383,17 @@ public class PipResizeGestureHandler { 
            return;

        }



        final Rect pipBounds = mPipBoundsState.getBounds();

        if (action == MotionEvent.ACTION_POINTER_DOWN) {

            if (mFirstIndex == -1 && mSecondIndex == -1) {

            if (mFirstIndex == -1 && mSecondIndex == -1

                    && pipBounds.contains((int) ev.getRawX(0), (int) ev.getRawY(0))

                    && pipBounds.contains((int) ev.getRawX(1), (int) ev.getRawY(1))) {

                mAllowGesture = true;

                mFirstIndex = 0;

                mSecondIndex = 1;

                mDownPoint.set(ev.getRawX(mFirstIndex), ev.getRawY(mFirstIndex));

                mDownSecondPoint.set(ev.getRawX(mSecondIndex), ev.getRawY(mSecondIndex));

                mDownBounds.set(mPipBoundsState.getBounds());

                mDownBounds.set(pipBounds);



                mLastPoint.set(mDownPoint);

                mLastSecondPoint.set(mLastSecondPoint);