commit c012085c6c6e1bef19d23bcfb8b0883a8d258dd6
author TreeHugger Robot <treehugger-gerrit@google.com> Sat Jun 04 01:38:29 2022 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Sat Jun 04 01:38:29 2022 +0000
tree 282ab35abd50803a1a6963269da16158d213360d
parent dd053e79e218282a059baf14334e26afcff649a1
parent 8d72018a872d403d4d0f0e16186f46ab49a9ebb5

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

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

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