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

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

Merge "Don't allow swiping to HintState if we're already in HintState" into tm-dev am: c012085c 

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



Change-Id: I35340674db72bc9a640653b9bba787e06b86ff23
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 6b390b8c c012085c

quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/NoButtonNavbarToOverviewTouchController.java

+1 −1
Original line number Diff line number Diff line
@@ -86,7 +86,7 @@ public class NoButtonNavbarToOverviewTouchController extends PortraitStatesTouch 
    @Override

    protected boolean canInterceptTouch(MotionEvent ev) {

        mDidTouchStartInNavBar = (ev.getEdgeFlags() & EDGE_NAV_BAR) != 0;

        return super.canInterceptTouch(ev);

        return super.canInterceptTouch(ev) && !mLauncher.isInState(HINT_STATE);

    }



    @Override