diff --git a/src/android/app/src/main/java/org/citra/citra_emu/features/settings/model/view/InputBindingSetting.kt b/src/android/app/src/main/java/org/citra/citra_emu/features/settings/model/view/InputBindingSetting.kt index c89f002e1..8ecd60684 100644 --- a/src/android/app/src/main/java/org/citra/citra_emu/features/settings/model/view/InputBindingSetting.kt +++ b/src/android/app/src/main/java/org/citra/citra_emu/features/settings/model/view/InputBindingSetting.kt @@ -78,15 +78,6 @@ class InputBindingSetting( else -> false } - - fun isDpadButtons(): Boolean = - when (abstractSetting.key) { - Settings.KEY_BUTTON_DOWN, - Settings.KEY_BUTTON_LEFT, - Settings.KEY_BUTTON_UP, - Settings.KEY_BUTTON_RIGHT -> true - else -> false - } /** * Returns true if this key is for the 3DS L/R or ZL/ZR buttons. Note, these are not real * triggers on the 3DS, but we support them as such on a physical gamepad. diff --git a/src/android/app/src/main/java/org/citra/citra_emu/features/settings/ui/SettingsFragmentPresenter.kt b/src/android/app/src/main/java/org/citra/citra_emu/features/settings/ui/SettingsFragmentPresenter.kt index 6b643dc16..0206a8082 100644 --- a/src/android/app/src/main/java/org/citra/citra_emu/features/settings/ui/SettingsFragmentPresenter.kt +++ b/src/android/app/src/main/java/org/citra/citra_emu/features/settings/ui/SettingsFragmentPresenter.kt @@ -621,12 +621,12 @@ class SettingsFragmentPresenter(private val fragmentView: SettingsFragmentView) add(InputBindingSetting(button, Settings.axisTitles[i])) } - add(HeaderSetting(R.string.controller_dpad_axis)) + add(HeaderSetting(R.string.controller_dpad_axis,R.string.controller_dpad_axis_description)) Settings.dPadAxisKeys.forEachIndexed { i: Int, key: String -> val button = getInputObject(key) add(InputBindingSetting(button, Settings.axisTitles[i])) } - add(HeaderSetting(R.string.controller_dpad_button)) + add(HeaderSetting(R.string.controller_dpad_button,R.string.controller_dpad_button_description)) Settings.dPadButtonKeys.forEachIndexed { i: Int, key: String -> val button = getInputObject(key) add(InputBindingSetting(button, Settings.dPadTitles[i])) diff --git a/src/android/app/src/main/res/values/strings.xml b/src/android/app/src/main/res/values/strings.xml index 9895e45d4..38537bccd 100644 --- a/src/android/app/src/main/res/values/strings.xml +++ b/src/android/app/src/main/res/values/strings.xml @@ -109,7 +109,9 @@ Trigger D-Pad D-Pad (Axis) + Some controllers will not be able to map their dpad as an axis. In that case, use the D-Pad (buttons) section below instead. D-Pad (Buttons) + Only map these buttons if the D-Pad (Axis) settings above do not work with your controller. Up/Down Axis Left/Right Axis Up