commit 5dacef0b59bc9b7bdc850535023cc2942a7ddf24
author TreeHugger Robot <treehugger-gerrit@google.com> Tue Mar 23 03:51:28 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Tue Mar 23 03:51:28 2021 +0000
tree ed791fd5c6979b4d7917091db8040333ddc91927
parent f31591e361dc74a7e50e5e62ec449911351d2e2b
parent 516dfc6aceeeb0f361a1b1b436280dfe2e468988

Merge "Fix extra haptic on swipe up" into sc-dev am: 516dfc6ace

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

Change-Id: Ib5911001ee68522f4d7248c8b0584736c22ae3cb

quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java

diff --git a/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java b/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
index 3094500..b492825 100644
--- a/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
+++ b/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
@@ -617,7 +617,7 @@
         final boolean passed = mCurrentShift.value >= MIN_PROGRESS_FOR_OVERVIEW;
         if (passed != mPassedOverviewThreshold) {
             mPassedOverviewThreshold = passed;
-            if (!mDeviceState.isTwoButtonNavMode()) {
+            if (mDeviceState.isTwoButtonNavMode()) {
                 performHapticFeedback();
             }
         }