Merge "Prevent repeated haptics on task dismissal." into sc-v2-dev (9fe8109b) · Commits · e / os / android_packages_apps_Trebuchet

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

+5 −1

Original line number	Original line	Diff line number	Diff line
	@@ -84,6 +84,8 @@ public abstract class TaskViewTouchController<T extends BaseDraggingActivity>

	private TaskView mTaskBeingDragged;		private TaskView mTaskBeingDragged;

			private boolean mIsDismissHapticRunning = false;

	public TaskViewTouchController(T activity) {		public TaskViewTouchController(T activity) {
	mActivity = activity;		mActivity = activity;
	mRecentsView = activity.getOverviewPanel();		mRecentsView = activity.getOverviewPanel();
	@@ -365,9 +367,10 @@ public abstract class TaskViewTouchController<T extends BaseDraggingActivity>
	mCurrentAnimation.startWithVelocity(mActivity, goingToEnd,		mCurrentAnimation.startWithVelocity(mActivity, goingToEnd,
	velocity * orientationHandler.getSecondaryTranslationDirectionFactor(),		velocity * orientationHandler.getSecondaryTranslationDirectionFactor(),
	mEndDisplacement, animationDuration);		mEndDisplacement, animationDuration);
	if (goingUp && goingToEnd) {		if (goingUp && goingToEnd && !mIsDismissHapticRunning) {
	VibratorWrapper.INSTANCE.get(mActivity).vibrate(TASK_DISMISS_VIBRATION_PRIMITIVE,		VibratorWrapper.INSTANCE.get(mActivity).vibrate(TASK_DISMISS_VIBRATION_PRIMITIVE,
	TASK_DISMISS_VIBRATION_PRIMITIVE_SCALE, TASK_DISMISS_VIBRATION_FALLBACK);		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);		mDetector.setDetectableScrollConditions(0, false);
	mTaskBeingDragged = null;		mTaskBeingDragged = null;
	mCurrentAnimation = null;		mCurrentAnimation = null;
			mIsDismissHapticRunning = false;
	}		}
	}		}