commit 112f2b9b9c0646741a7c6fdbb2ac31769ce71056
author TreeHugger Robot <treehugger-gerrit@google.com> Tue Mar 23 03:51:49 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Tue Mar 23 03:51:49 2021 +0000
tree ed791fd5c6979b4d7917091db8040333ddc91927
parent 79012dfb35c6f61dc88a1bc397fd359562d1db3c
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: I015c69b5fe17e6ef1ef8d0b7c722b0edddfead1a

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();
             }
         }