| commit | b2ac0758a4f49be47d9bf3915ce547b27b44d744 | [log] [tgz] |
|---|---|---|
| author | TreeHugger Robot <treehugger-gerrit@google.com> | Thu Apr 21 17:37:07 2022 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Apr 21 17:37:07 2022 +0000 |
| tree | 5ab81ba077635a00c147ebb00998398f7de4ee33 | |
| parent | d2f6c827b354d672354be2cf23df98f3f9d238eb [diff] | |
| parent | 8e0177813a6ce9c496e2e3539e6a4b859cab4afe [diff] |
Merge "Disallow long press below taskbar icons" into tm-dev am: 8e0177813a Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/17872520 Change-Id: I04507f80a451a1d3eff5e8a15667718afd106b91 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
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)) {