| commit | 774c53f919b3308d88d60213617ab1e731fe89c9 | [log] [tgz] |
|---|---|---|
| author | TreeHugger Robot <treehugger-gerrit@google.com> | Sat Jun 04 02:01:22 2022 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Sat Jun 04 02:01:22 2022 +0000 |
| tree | 282ab35abd50803a1a6963269da16158d213360d | |
| parent | 6b390b8c164d2d5b7a0268cc62b43c2531e7b34f [diff] | |
| parent | c012085c6c6e1bef19d23bcfb8b0883a8d258dd6 [diff] |
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>
diff --git a/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/NoButtonNavbarToOverviewTouchController.java b/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/NoButtonNavbarToOverviewTouchController.java index 4da1d41..8faabc9 100644 --- a/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/NoButtonNavbarToOverviewTouchController.java +++ b/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/NoButtonNavbarToOverviewTouchController.java
@@ -86,7 +86,7 @@ @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