Merge "Adjusting MSDL vibration attributes for consistency with constants." into main (eff91c9f) · Commits · e / os / android_frameworks_base

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

+10 −18

Original line number	Original line	Diff line number	Diff line
	@@ -22,7 +22,6 @@ import android.annotation.DrawableRes
	import android.annotation.SuppressLint		import android.annotation.SuppressLint
	import android.graphics.Point		import android.graphics.Point
	import android.graphics.Rect		import android.graphics.Rect
	import android.os.VibrationAttributes
	import android.util.Log		import android.util.Log
	import android.view.HapticFeedbackConstants		import android.view.HapticFeedbackConstants
	import android.view.View		import android.view.View
	@@ -41,6 +40,7 @@ import com.android.app.animation.Interpolators
	import com.android.app.tracing.coroutines.launch		import com.android.app.tracing.coroutines.launch
	import com.android.internal.jank.InteractionJankMonitor		import com.android.internal.jank.InteractionJankMonitor
	import com.android.internal.jank.InteractionJankMonitor.CUJ_SCREEN_OFF_SHOW_AOD		import com.android.internal.jank.InteractionJankMonitor.CUJ_SCREEN_OFF_SHOW_AOD
			import com.android.keyguard.AuthInteractionProperties
	import com.android.systemui.Flags.msdlFeedback		import com.android.systemui.Flags.msdlFeedback
	import com.android.systemui.Flags.newAodTransition		import com.android.systemui.Flags.newAodTransition
	import com.android.systemui.common.shared.model.Icon		import com.android.systemui.common.shared.model.Icon
	@@ -82,7 +82,6 @@ import com.android.systemui.util.ui.isAnimating
	import com.android.systemui.util.ui.stopAnimating		import com.android.systemui.util.ui.stopAnimating
	import com.android.systemui.util.ui.value		import com.android.systemui.util.ui.value
	import com.google.android.msdl.data.model.MSDLToken		import com.google.android.msdl.data.model.MSDLToken
	import com.google.android.msdl.domain.InteractionProperties
	import com.google.android.msdl.domain.MSDLPlayer		import com.google.android.msdl.domain.MSDLPlayer
	import kotlin.math.min		import kotlin.math.min
	import kotlinx.coroutines.CoroutineDispatcher		import kotlinx.coroutines.CoroutineDispatcher
	@@ -358,14 +357,10 @@ object KeyguardRootViewBinder {
	launch {		launch {
	deviceEntryHapticsInteractor.playSuccessHaptic.collect {		deviceEntryHapticsInteractor.playSuccessHaptic.collect {
	if (msdlFeedback()) {		if (msdlFeedback()) {
	val properties =		msdlPlayer?.playToken(
	object : InteractionProperties {		MSDLToken.UNLOCK,
	override val vibrationAttributes: VibrationAttributes =		authInteractionProperties
	VibrationAttributes.createForUsage(
	VibrationAttributes.USAGE_HARDWARE_FEEDBACK
	)		)
	}
	msdlPlayer?.playToken(MSDLToken.UNLOCK, properties)
	} else {		} else {
	vibratorHelper.performHapticFeedback(		vibratorHelper.performHapticFeedback(
	view,		view,
	@@ -378,14 +373,10 @@ object KeyguardRootViewBinder {
	launch {		launch {
	deviceEntryHapticsInteractor.playErrorHaptic.collect {		deviceEntryHapticsInteractor.playErrorHaptic.collect {
	if (msdlFeedback()) {		if (msdlFeedback()) {
	val properties =		msdlPlayer?.playToken(
	object : InteractionProperties {		MSDLToken.FAILURE,
	override val vibrationAttributes: VibrationAttributes =		authInteractionProperties
	VibrationAttributes.createForUsage(
	VibrationAttributes.USAGE_HARDWARE_FEEDBACK
	)		)
	}
	msdlPlayer?.playToken(MSDLToken.FAILURE, properties)
	} else {		} else {
	vibratorHelper.performHapticFeedback(		vibratorHelper.performHapticFeedback(
	view,		view,
	@@ -660,6 +651,7 @@ object KeyguardRootViewBinder {
	private val lockIcon = R.id.lock_icon_view		private val lockIcon = R.id.lock_icon_view
	private val deviceEntryIcon = R.id.device_entry_icon_view		private val deviceEntryIcon = R.id.device_entry_icon_view
	private val nsslPlaceholderId = R.id.nssl_placeholder		private val nsslPlaceholderId = R.id.nssl_placeholder
			private val authInteractionProperties = AuthInteractionProperties()

	private const val ID = "occluding_app_device_entry_unlock_msg"		private const val ID = "occluding_app_device_entry_unlock_msg"
	private const val AOD_ICONS_APPEAR_DURATION: Long = 200		private const val AOD_ICONS_APPEAR_DURATION: Long = 200