Merge "Start pinchResize only if pointers are inside PIP" into sc-dev am: c6e212c5b2 am: 2c8878f17b (153d2538) · Commits · e / os / android_frameworks_base

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

+9 −4

Original line number	Original line	Diff line number	Diff line
	@@ -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;