commit fa0df11f454bb487c8b9f920ffe618e3ad5e4dc9
author Pat Manning <patmanning@google.com> Wed Sep 29 13:32:39 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Sep 29 13:32:39 2021 +0000
tree 992b24e3725dc29c209bf6993faf8850ea9bb235
parent c14688087c2c633173ee98e2b5a3d50ad58faedd
parent 9fe8109b3504f9aa4801d18098282fe5c56d67a0

Merge "Prevent repeated haptics on task dismissal." into sc-v2-dev am: 9fe8109b35

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

Change-Id: Ic7b442f62f1c8139be530225217dedbe17c551d0

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

diff --git a/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/TaskViewTouchController.java b/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/TaskViewTouchController.java
index 010f463..37a1674 100644
--- a/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/TaskViewTouchController.java
+++ b/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/TaskViewTouchController.java
@@ -84,6 +84,8 @@
 
     private TaskView mTaskBeingDragged;
 
+    private boolean mIsDismissHapticRunning = false;
+
     public TaskViewTouchController(T activity) {
         mActivity = activity;
         mRecentsView = activity.getOverviewPanel();
@@ -365,9 +367,10 @@
         mCurrentAnimation.startWithVelocity(mActivity, goingToEnd,
                 velocity * orientationHandler.getSecondaryTranslationDirectionFactor(),
                 mEndDisplacement, animationDuration);
-        if (goingUp && goingToEnd) {
+        if (goingUp && goingToEnd && !mIsDismissHapticRunning) {
             VibratorWrapper.INSTANCE.get(mActivity).vibrate(TASK_DISMISS_VIBRATION_PRIMITIVE,
                     TASK_DISMISS_VIBRATION_PRIMITIVE_SCALE, TASK_DISMISS_VIBRATION_FALLBACK);
+            mIsDismissHapticRunning = true;
         }
     }
 
@@ -376,5 +379,6 @@
         mDetector.setDetectableScrollConditions(0, false);
         mTaskBeingDragged = null;
         mCurrentAnimation = null;
+        mIsDismissHapticRunning = false;
     }
 }