Merge "Reset `mShouldClick` on ACTION_CANCEL event so click is not performed" into main (b354181a) · Commits · e / os / android_frameworks_base

libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/DesktopModeWindowDecorViewModel.java

+5 −0

Original line number	Diff line number	Diff line
		@@ -536,6 +536,11 @@ public class DesktopModeWindowDecorViewModel implements WindowDecorViewModel {
		if (mGestureDetector.onTouchEvent(e)) {
		return true;
		}
		if (e.getActionMasked() == MotionEvent.ACTION_CANCEL) {
		// If a motion event is cancelled, reset mShouldClick so a click is not accidentally
		// performed.
		mShouldClick = false;
		}
		switch (e.getActionMasked()) {
		case MotionEvent.ACTION_DOWN: {
		mDragPointerId = e.getPointerId(0);