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

Merge "Start pinchResize only if pointers are inside PIP" into sc-dev am: c6e212c5b2

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

Change-Id: I1744f1c6ce15ed67bf4dfb8f591eafcd2477e77a
This commit is contained in:
Jorge Gil
2021-06-16 22:04:14 +00:00
committed by Automerger Merge Worker
parent ba821a1a9f c6e212c5b2
commit d599c111a7
1 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -235,15 +235,20 @@ public class PipResizeGestureHandler {
@VisibleForTesting @VisibleForTesting
void onInputEvent(InputEvent ev) { void onInputEvent(InputEvent ev) {
if (!mEnableDragCornerResize && !mEnablePinchResize) {
// No need to handle anything if neither form of resizing is enabled.
return;
}
// Don't allow resize when PiP is stashed. // Don't allow resize when PiP is stashed.
if (mPipBoundsState.isStashed()) { if (mPipBoundsState.isStashed()) {
return; return;
} }
if (ev instanceof MotionEvent) { if (ev instanceof MotionEvent) {
if (mOngoingPinchToResize) { if (mEnablePinchResize && mOngoingPinchToResize) {
onPinchResize((MotionEvent) ev); onPinchResize((MotionEvent) ev);
} else { } else if (mEnableDragCornerResize) {
onDragCornerResize((MotionEvent) ev); onDragCornerResize((MotionEvent) ev);
} }
} }
@@ -318,8 +323,8 @@ public class PipResizeGestureHandler {
case MotionEvent.ACTION_POINTER_DOWN: case MotionEvent.ACTION_POINTER_DOWN:
if (mEnablePinchResize && ev.getPointerCount() == 2) { if (mEnablePinchResize && ev.getPointerCount() == 2) {
onPinchResize(ev); onPinchResize(ev);
mOngoingPinchToResize = true; mOngoingPinchToResize = mAllowGesture;
return true; return mAllowGesture;
} }
break; break;