commit b354181a6ed1df8f0e6753cd83bedaa87ae782c3
author Eghosa Ewansiha-Vlachavas <eevlachavas@google.com> Fri Nov 17 22:46:41 2023 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Nov 17 22:46:41 2023 +0000
tree 740f695ceb68bd62446f2b451a33c792777b40d4
parent f3e29a8902edd63227d02303959ad010354b0037
parent 1383da0cd4763091d33a74b200dde88eb878474a

Merge "Reset `mShouldClick` on ACTION_CANCEL event so click is not performed" into main

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

diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/DesktopModeWindowDecorViewModel.java b/libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/DesktopModeWindowDecorViewModel.java
index 3add6f4..dd6ca8d 100644
--- a/libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/DesktopModeWindowDecorViewModel.java
+++ b/libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/DesktopModeWindowDecorViewModel.java
@@ -536,6 +536,11 @@
             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);