Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d1ab7dc2 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Disallow long press below taskbar icons" into tm-dev am: 8e017781 am: b2ac0758 

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/17872520



Change-Id: I293cc8908f34ec5d8ed6bc77a315b220ff597812
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents c2625041 b2ac0758

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

+2 −2
Original line number Diff line number Diff line
@@ -312,8 +312,8 @@ public class TaskbarView extends FrameLayout implements FolderIcon.FolderIconPar 
        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)) {