@@ -903,14 +903,6 @@ class KeyMapController(
903903 }
904904
905905 detectedShortPressTriggers.add(triggerIndex)
906-
907- val vibrateDuration = when {
908- trigger.vibrate -> vibrateDuration(trigger)
909- forceVibrate.value -> defaultVibrateDuration.value
910- else -> - 1L
911- }
912-
913- vibrateDurations.add(vibrateDuration)
914906 }
915907 } else {
916908 performActionsAfterSequenceTriggerTimeout[triggerIndex]?.cancel()
@@ -1023,11 +1015,13 @@ class KeyMapController(
10231015 useCase.showTriggeredToast()
10241016 }
10251017
1026- if (forceVibrate.value) {
1027- useCase.vibrate(defaultVibrateDuration.value)
1028- } else {
1029- vibrateDurations.maxOrNull()?.let {
1030- useCase.vibrate(it)
1018+ if (vibrateDurations.isNotEmpty()) {
1019+ if (forceVibrate.value) {
1020+ useCase.vibrate(defaultVibrateDuration.value)
1021+ } else {
1022+ vibrateDurations.maxOrNull()?.let {
1023+ useCase.vibrate(it)
1024+ }
10311025 }
10321026 }
10331027
@@ -1385,12 +1379,6 @@ class KeyMapController(
13851379 if (trigger.showToast) {
13861380 showToast = true
13871381 }
1388-
1389- triggerActions[triggerIndex].forEachIndexed { _, _ ->
1390- if (trigger.vibrate) {
1391- vibrateDurations.add(vibrateDuration(trigger))
1392- }
1393- }
13941382 }
13951383
13961384 iterator.remove()
@@ -1422,14 +1410,6 @@ class KeyMapController(
14221410 }
14231411 }
14241412
1425- if (forceVibrate.value) {
1426- useCase.vibrate(defaultVibrateDuration.value)
1427- } else {
1428- vibrateDurations.maxOrNull()?.let {
1429- useCase.vibrate(it)
1430- }
1431- }
1432-
14331413 if (showToast) {
14341414 useCase.showTriggeredToast()
14351415 }
@@ -1558,14 +1538,6 @@ class KeyMapController(
15581538 useCase.showTriggeredToast()
15591539 }
15601540
1561- if (forceVibrate.value) {
1562- useCase.vibrate(defaultVibrateDuration.value)
1563- } else {
1564- vibrateDurations.maxOrNull()?.let {
1565- useCase.vibrate(it)
1566- }
1567- }
1568-
15691541 detectedTriggerIndexes.forEach { triggerIndex ->
15701542 parallelTriggerActionPerformers[triggerIndex]?.onTriggered(
15711543 calledOnTriggerRelease = true ,
0 commit comments