Merge "Only playing non-msdl shortcut haptics with user long-presses." into main (82b4d44f) · Commits · e / os / android_frameworks_base

packages/SystemUI/multivalentTests/src/com/android/systemui/keyguard/data/quickaffordance/KeyguardQuickAffordanceHapticViewModelTest.kt

+2 −2

Original line number	Diff line number	Diff line
		@@ -136,9 +136,9 @@ class KeyguardQuickAffordanceHapticViewModelTest : SysuiTestCase() {
		}

		private fun toggleQuickAffordance(on: Boolean) {
		underTest.onQuickAffordanceLongPress()
		underTest.onQuickAffordanceLongPress(isActivated = false)
		underTest.updateActivatedHistory(!on)
		underTest.onQuickAffordanceLongPress()
		underTest.onQuickAffordanceLongPress(isActivated = true)
		underTest.updateActivatedHistory(on)
		}
		}

+1 −1

Original line number	Diff line number	Diff line
		@@ -308,7 +308,7 @@ constructor(
		}

		if (viewModel.configKey != null) {
		hapticsViewModel.onQuickAffordanceLongPress()
		hapticsViewModel.onQuickAffordanceLongPress(viewModel.isActivated)
		viewModel.onClicked(
		KeyguardQuickAffordanceViewModel.OnClickedParameters(
		configKey = viewModel.configKey,

+10 −7

Original line number	Diff line number	Diff line
		@@ -40,19 +40,22 @@ constructor(private val msdlPlayer: MSDLPlayer, private val vibratorHelper: Vibr

		if (Flags.msdlFeedback()) {
		playMSDLToggleHaptics(toggleOn, toggleOff)
		} else {
		vibratorHelper.vibrate(
		}
		}

		fun onQuickAffordanceLongPress(isActivated: Boolean) {
		longPressed = true
		if (!Flags.msdlFeedback()) {
		// Without MSDL, we need to play haptics on long-press instead of when the activated
		// history updates.
		val vibration =
		if (isActivated) {
		KeyguardBottomAreaVibrations.Activated
		} else {
		KeyguardBottomAreaVibrations.Deactivated
		}
		)
		}
		vibratorHelper.vibrate(vibration)
		}

		fun onQuickAffordanceLongPress() {
		longPressed = true
		}

		fun onQuickAffordanceClick() {