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

Merge "PiP: Move tap-outside-hide block one level higher." into sc-dev

Browse Source
This commit is contained in:
Hongwei Wang
2021-07-01 04:31:08 +00:00
committed by Android (Google) Code Review
parent 24b5ca6b4b 67760d21fd
commit 395c582b62
1 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -246,10 +246,20 @@ public class PipResizeGestureHandler {
} }
if (ev instanceof MotionEvent) { if (ev instanceof MotionEvent) {
MotionEvent mv = (MotionEvent) ev;
int action = mv.getActionMasked();
final Rect pipBounds = mPipBoundsState.getBounds();
if (action == MotionEvent.ACTION_UP || action == MotionEvent.ACTION_CANCEL) {
if (!pipBounds.contains((int) mv.getRawX(), (int) mv.getRawY())
&& mPhonePipMenuController.isMenuVisible()) {
mPhonePipMenuController.hideMenu();
}
}
if (mEnablePinchResize && mOngoingPinchToResize) { if (mEnablePinchResize && mOngoingPinchToResize) {
onPinchResize((MotionEvent) ev); onPinchResize(mv);
} else if (mEnableDragCornerResize) { } else if (mEnableDragCornerResize) {
onDragCornerResize((MotionEvent) ev); onDragCornerResize(mv);
} }
} }
} }
@@ -450,7 +460,6 @@ public class PipResizeGestureHandler {
float x = ev.getX(); float x = ev.getX();
float y = ev.getY() - mOhmOffset; float y = ev.getY() - mOhmOffset;
if (action == MotionEvent.ACTION_DOWN) { if (action == MotionEvent.ACTION_DOWN) {
final Rect currentPipBounds = mPipBoundsState.getBounds();
mLastResizeBounds.setEmpty(); mLastResizeBounds.setEmpty();
mAllowGesture = isInValidSysUiState() && isWithinDragResizeRegion((int) x, (int) y); mAllowGesture = isInValidSysUiState() && isWithinDragResizeRegion((int) x, (int) y);
if (mAllowGesture) { if (mAllowGesture) {
@@ -458,11 +467,6 @@ public class PipResizeGestureHandler {
mDownPoint.set(x, y); mDownPoint.set(x, y);
mDownBounds.set(mPipBoundsState.getBounds()); mDownBounds.set(mPipBoundsState.getBounds());
} }
if (!currentPipBounds.contains((int) x, (int) y)
&& mPhonePipMenuController.isMenuVisible()) {
mPhonePipMenuController.hideMenu();
}
} else if (mAllowGesture) { } else if (mAllowGesture) {
switch (action) { switch (action) {
case MotionEvent.ACTION_POINTER_DOWN: case MotionEvent.ACTION_POINTER_DOWN: