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

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

Browse Source
This commit is contained in:
Ben Lin
2021-05-17 17:58:23 +00:00
committed by Android (Google) Code Review
parent e265a992a6 6f36c5bedc
commit 750ddcc618
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -383,14 +383,17 @@ public class PipResizeGestureHandler {
return; return;
} }
final Rect pipBounds = mPipBoundsState.getBounds();
if (action == MotionEvent.ACTION_POINTER_DOWN) { 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; mAllowGesture = true;
mFirstIndex = 0; mFirstIndex = 0;
mSecondIndex = 1; mSecondIndex = 1;
mDownPoint.set(ev.getRawX(mFirstIndex), ev.getRawY(mFirstIndex)); mDownPoint.set(ev.getRawX(mFirstIndex), ev.getRawY(mFirstIndex));
mDownSecondPoint.set(ev.getRawX(mSecondIndex), ev.getRawY(mSecondIndex)); mDownSecondPoint.set(ev.getRawX(mSecondIndex), ev.getRawY(mSecondIndex));
mDownBounds.set(mPipBoundsState.getBounds()); mDownBounds.set(pipBounds);
mLastPoint.set(mDownPoint); mLastPoint.set(mDownPoint);
mLastSecondPoint.set(mLastSecondPoint); mLastSecondPoint.set(mLastSecondPoint);