Merge "Prevent repeated haptics on task dismissal." into sc-v2-dev

This commit is contained in:
Pat Manning
2021-09-29 13:28:37 +00:00
committed by Android (Google) Code Review

View File

@@ -84,6 +84,8 @@ public abstract class TaskViewTouchController<T extends BaseDraggingActivity>
private TaskView mTaskBeingDragged;
private boolean mIsDismissHapticRunning = false;
public TaskViewTouchController(T activity) {
mActivity = activity;
mRecentsView = activity.getOverviewPanel();
@@ -365,9 +367,10 @@ public abstract class TaskViewTouchController<T extends BaseDraggingActivity>
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 @@ public abstract class TaskViewTouchController<T extends BaseDraggingActivity>
mDetector.setDetectableScrollConditions(0, false);
mTaskBeingDragged = null;
mCurrentAnimation = null;
mIsDismissHapticRunning = false;
}
}