Merge pull request #14718 from JosJuice/android-vibration-length

Android: Make vibration length variable

1 files changed, 9 insertions, 3 deletions

diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/input/model/ControllerInterface.kt b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/input/model/ControllerInterface.kt
index b412b6ef9b..bcd47781a0 100644
--- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/input/model/ControllerInterface.kt
+++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/input/model/ControllerInterface.kt
@@ -186,7 +186,7 @@ object ControllerInterface {
     private fun vibrate(vibrator: Vibrator) {
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
             vibrator.vibrate(
-                VibrationEffect.createOneShot(100, VibrationEffect.DEFAULT_AMPLITUDE),
+                VibrationEffect.createOneShot(10000, VibrationEffect.DEFAULT_AMPLITUDE),
                 VibrationAttributes.Builder().setUsage(VibrationAttributes.USAGE_MEDIA).build()
             )
         } else {
@@ -194,16 +194,22 @@ object ControllerInterface {
             if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
                 @Suppress("DEPRECATION")
                 vibrator.vibrate(
-                    VibrationEffect.createOneShot(100, VibrationEffect.DEFAULT_AMPLITUDE),
+                    VibrationEffect.createOneShot(10000, VibrationEffect.DEFAULT_AMPLITUDE),
                     attributes
                 )
             } else {
                 @Suppress("DEPRECATION")
-                vibrator.vibrate(100, attributes)
+                vibrator.vibrate(10000, attributes)
             }
         }
     }
 
+    @Keep
+    @JvmStatic
+    private fun cancelVibration(vibrator: Vibrator) {
+        vibrator.cancel()
+    }
+
     private class InputDeviceListener : InputManager.InputDeviceListener {
         override external fun onInputDeviceAdded(deviceId: Int)