| commit | d1ab7dc29103b1adb1ccebb9cc071c93bde9fafe | [log] [tgz] |
|---|---|---|
| author | TreeHugger Robot <treehugger-gerrit@google.com> | Thu Apr 21 18:00:01 2022 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Apr 21 18:00:01 2022 +0000 |
| tree | 4460c5dc8ea6ceb68639d6af1ba08e5545e218d3 | |
| parent | c2625041e1d4f58a707125e3662fb7592636c4a3 [diff] | |
| parent | b2ac0758a4f49be47d9bf3915ce547b27b44d744 [diff] |
Merge "Disallow long press below taskbar icons" into tm-dev am: 8e0177813a am: b2ac0758a4 Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/17872520 Change-Id: I293cc8908f34ec5d8ed6bc77a315b220ff597812 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)) {