Merge "[PIP2] Enable drag-to-dismiss." into main (dc12d6ea) · Commits · e / os / android_frameworks_base

libs/WindowManager/Shell/src/com/android/wm/shell/pip2/phone/PipTouchHandler.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -582,7 +582,6 @@ public class PipTouchHandler implements PipTransitionState.PipTransitionStateCha
		return true;
		}

		/*
		if ((ev.getAction() == MotionEvent.ACTION_DOWN \|\| mTouchState.isUserInteracting())
		&& mPipDismissTargetHandler.maybeConsumeMotionEvent(ev)) {
		// If the first touch event occurs within the magnetic field, pass the ACTION_DOWN event
		@@ -599,6 +598,7 @@ public class PipTouchHandler implements PipTransitionState.PipTransitionStateCha
		return true;
		}

		/*
		// Ignore the motion event When the entry animation is waiting to be started
		if (!mTouchState.isUserInteracting() && mPipTaskOrganizer.isEntryScheduled()) {
		ProtoLog.wtf(WM_SHELL_PICTURE_IN_PICTURE,