Disable vibration strength preference

Perform haptic feedback on virtual button release
rafaelvcaetano · Feb 28, 2025 · 00119a3 · 00119a3 · FATCatAndroid12 · Mar 3, 2025
1 parent 23cc6a9
commit 00119a3
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 6 deletions.
diff --git a/app/src/main/java/me/magnum/melonds/ui/emulator/input/FeedbackInputHandler.kt b/app/src/main/java/me/magnum/melonds/ui/emulator/input/FeedbackInputHandler.kt
@@ -1,11 +1,23 @@
 package me.magnum.melonds.ui.emulator.input
 
+import android.view.HapticFeedbackConstants
+import android.view.View
 import me.magnum.melonds.common.vibration.TouchVibrator
 
 abstract class FeedbackInputHandler(inputListener: IInputListener, private val enableHapticFeedback: Boolean, private val touchVibrator: TouchVibrator) : BaseInputHandler(inputListener) {
-    protected fun performHapticFeedback() {
+
+    enum class HapticFeedbackType {
+        KEY_PRESS,
+        KEY_RELEASE
+    }
+
+    protected fun performHapticFeedback(view: View, type: HapticFeedbackType) {
         if (enableHapticFeedback) {
-            touchVibrator.performTouchHapticFeedback()
+            val feedbackType = when (type) {
+                HapticFeedbackType.KEY_PRESS -> HapticFeedbackConstants.KEYBOARD_TAP
+                HapticFeedbackType.KEY_RELEASE -> HapticFeedbackConstants.CLOCK_TICK
+            }
+            view.performHapticFeedback(feedbackType)
         }
     }
 }
diff --git a/app/src/main/java/me/magnum/melonds/ui/emulator/input/MultiButtonInputHandler.kt b/app/src/main/java/me/magnum/melonds/ui/emulator/input/MultiButtonInputHandler.kt
@@ -40,6 +40,10 @@ abstract class MultiButtonInputHandler(inputListener: IInputListener, enableHapt
             inputListener.onKeyReleased(it)
         }
 
+        if (tempInputList.isNotEmpty()) {
+            performHapticFeedback(v, HapticFeedbackType.KEY_RELEASE)
+        }
+
         tempInputList.clear()
         newPressedInputs.filterNotTo(tempInputList) {
             it in pressedInputs
@@ -48,7 +52,7 @@ abstract class MultiButtonInputHandler(inputListener: IInputListener, enableHapt
         }
 
         if (tempInputList.isNotEmpty()) {
-            performHapticFeedback()
+            performHapticFeedback(v, HapticFeedbackType.KEY_PRESS)
         }
 
         pressedInputs.clear()

diff --git a/app/src/main/java/me/magnum/melonds/ui/emulator/input/SingleButtonInputHandler.kt b/app/src/main/java/me/magnum/melonds/ui/emulator/input/SingleButtonInputHandler.kt
@@ -10,9 +10,12 @@ class SingleButtonInputHandler(inputListener: IInputListener, private val input:
         when (event.action) {
             MotionEvent.ACTION_DOWN -> {
                 inputListener.onKeyPress(input)
-                performHapticFeedback()
+                performHapticFeedback(v, HapticFeedbackType.KEY_PRESS)
+            }
+            MotionEvent.ACTION_UP -> {
+                inputListener.onKeyReleased(input)
+                performHapticFeedback(v, HapticFeedbackType.KEY_RELEASE)
             }
-            MotionEvent.ACTION_UP -> inputListener.onKeyReleased(input)
         }
         return true
     }

diff --git a/app/src/main/java/me/magnum/melonds/ui/settings/fragments/InputPreferencesFragment.kt b/app/src/main/java/me/magnum/melonds/ui/settings/fragments/InputPreferencesFragment.kt
@@ -30,8 +30,8 @@ class InputPreferencesFragment : PreferenceFragmentCompat(), PreferenceFragmentT
 
         if (!vibrator.supportsVibration()) {
             touchVibratePreference.isVisible = false
-            vibrationStrengthPreference.isVisible = false
         }
+        vibrationStrengthPreference.isVisible = false
 
         vibrationStrengthPreference.setOnPreferenceChangeListener { _, newValue ->
             val strength = newValue as Int