commit 8e0177813a6ce9c496e2e3539e6a4b859cab4afe
author TreeHugger Robot <treehugger-gerrit@google.com> Thu Apr 21 17:16:42 2022 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Apr 21 17:16:42 2022 +0000
tree 18d3746ec55774ee526a6039d6bce0361343a255
parent 1e583dfa0e798468d3d137e33c6ed752d4108cfe
parent 81bff9becd24a027e0a346dab6adb6b265bd2989

Merge "Disallow long press below taskbar icons" into tm-dev

quickstep/src/com/android/launcher3/taskbar/TaskbarView.java

diff --git a/quickstep/src/com/android/launcher3/taskbar/TaskbarView.java b/quickstep/src/com/android/launcher3/taskbar/TaskbarView.java
index 8291475..7548398 100644
--- a/quickstep/src/com/android/launcher3/taskbar/TaskbarView.java
+++ b/quickstep/src/com/android/launcher3/taskbar/TaskbarView.java
@@ -312,8 +312,8 @@
         if (!mTouchEnabled) {
             return true;
         }
-        if (mIconLayoutBounds.contains((int) event.getX(), (int) event.getY())) {
-            // Don't allow long pressing between icons.
+        if (mIconLayoutBounds.left <= event.getX() && event.getX() <= mIconLayoutBounds.right) {
+            // Don't allow long pressing between icons, or above/below them.
             return true;
         }
         if (mControllerCallbacks.onTouchEvent(event)) {