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

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

Change-Id: I35340674db72bc9a640653b9bba787e06b86ff23
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
TreeHugger Robot
2022-06-04 02:01:22 +00:00
committed by Automerger Merge Worker

View File

@@ -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