Merge "Cleanup of the flag ONE_WAY_HAPTICS_API_MIGRATION on KeyguardRootViewBinder" into main (5d9a1910) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/keyguard/ui/binder/KeyguardRootViewBinder.kt

+8 −20

Original line number	Original line	Diff line number	Diff line
	@@ -224,16 +224,10 @@ object KeyguardRootViewBinder {
	deviceEntryHapticsInteractor.playSuccessHaptic		deviceEntryHapticsInteractor.playSuccessHaptic
	.filter { it }		.filter { it }
	.collect {		.collect {
	if (
	featureFlags.isEnabled(Flags.ONE_WAY_HAPTICS_API_MIGRATION)
	) {
	vibratorHelper.performHapticFeedback(		vibratorHelper.performHapticFeedback(
	view,		view,
	HapticFeedbackConstants.CONFIRM,		HapticFeedbackConstants.CONFIRM,
	)		)
	} else {
	vibratorHelper.vibrateAuthSuccess("device-entry::success")
	}
	deviceEntryHapticsInteractor.handleSuccessHaptic()		deviceEntryHapticsInteractor.handleSuccessHaptic()
	}		}
	}		}
	@@ -242,16 +236,10 @@ object KeyguardRootViewBinder {
	deviceEntryHapticsInteractor.playErrorHaptic		deviceEntryHapticsInteractor.playErrorHaptic
	.filter { it }		.filter { it }
	.collect {		.collect {
	if (
	featureFlags.isEnabled(Flags.ONE_WAY_HAPTICS_API_MIGRATION)
	) {
	vibratorHelper.performHapticFeedback(		vibratorHelper.performHapticFeedback(
	view,		view,
	HapticFeedbackConstants.REJECT,		HapticFeedbackConstants.REJECT,
	)		)
	} else {
	vibratorHelper.vibrateAuthSuccess("device-entry::error")
	}
	deviceEntryHapticsInteractor.handleErrorHaptic()		deviceEntryHapticsInteractor.handleErrorHaptic()
	}		}
	}		}