summaryrefslogtreecommitdiff
path: root/src/android
diff options
context:
space:
mode:
authorGravatar Charles Lombardo2023-04-04 13:10:17 -0400
committerGravatar bunnei2023-06-03 00:05:49 -0700
commitbebc822334bf0e974b161771acec720956acac46 (patch)
treeadbf70a22871fd8529e429b4dcb0312c1fb74030 /src/android
parentandroid: Make hash and branch accessible from BuildConfig (diff)
downloadyuzu-bebc822334bf0e974b161771acec720956acac46.tar.gz
yuzu-bebc822334bf0e974b161771acec720956acac46.tar.xz
yuzu-bebc822334bf0e974b161771acec720956acac46.zip
android: Add relative stick center toggle
Diffstat (limited to 'src/android')
-rw-r--r--src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/EmulationFragment.kt7
-rw-r--r--src/android/app/src/main/res/menu/menu_overlay_options.xml5
-rw-r--r--src/android/app/src/main/res/values/strings.xml1
3 files changed, 13 insertions, 0 deletions
diff --git a/src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/EmulationFragment.kt b/src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/EmulationFragment.kt
index 1d4641d5c..79383b1dd 100644
--- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/EmulationFragment.kt
+++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/EmulationFragment.kt
@@ -222,6 +222,8 @@ class EmulationFragment : Fragment(), SurfaceHolder.Callback {
222 222
223 popup.menuInflater.inflate(R.menu.menu_overlay_options, popup.menu) 223 popup.menuInflater.inflate(R.menu.menu_overlay_options, popup.menu)
224 224
225 popup.menu.findItem(R.id.menu_rel_stick_center).isChecked = EmulationMenuSettings.joystickRelCenter
226
225 popup.setOnMenuItemClickListener { 227 popup.setOnMenuItemClickListener {
226 when (it.itemId) { 228 when (it.itemId) {
227 R.id.menu_edit_overlay -> { 229 R.id.menu_edit_overlay -> {
@@ -259,6 +261,11 @@ class EmulationFragment : Fragment(), SurfaceHolder.Callback {
259 261
260 true 262 true
261 } 263 }
264 R.id.menu_rel_stick_center -> {
265 it.isChecked = !it.isChecked
266 EmulationMenuSettings.joystickRelCenter = it.isChecked
267 true
268 }
262 R.id.menu_reset_overlay -> { 269 R.id.menu_reset_overlay -> {
263 binding.drawerLayout.close() 270 binding.drawerLayout.close()
264 resetInputOverlay() 271 resetInputOverlay()
diff --git a/src/android/app/src/main/res/menu/menu_overlay_options.xml b/src/android/app/src/main/res/menu/menu_overlay_options.xml
index b9341c508..151f305fb 100644
--- a/src/android/app/src/main/res/menu/menu_overlay_options.xml
+++ b/src/android/app/src/main/res/menu/menu_overlay_options.xml
@@ -10,6 +10,11 @@
10 android:title="@string/emulation_toggle_controls" /> 10 android:title="@string/emulation_toggle_controls" />
11 11
12 <item 12 <item
13 android:id="@+id/menu_rel_stick_center"
14 android:title="@string/emulation_rel_stick_center"
15 android:checkable="true" />
16
17 <item
13 android:id="@+id/menu_reset_overlay" 18 android:id="@+id/menu_reset_overlay"
14 android:title="@string/emulation_touch_overlay_reset" /> 19 android:title="@string/emulation_touch_overlay_reset" />
15 20
diff --git a/src/android/app/src/main/res/values/strings.xml b/src/android/app/src/main/res/values/strings.xml
index 98a06c45d..441d88978 100644
--- a/src/android/app/src/main/res/values/strings.xml
+++ b/src/android/app/src/main/res/values/strings.xml
@@ -87,6 +87,7 @@
87 <string name="emulation_exit">Exit Emulation</string> 87 <string name="emulation_exit">Exit Emulation</string>
88 <string name="emulation_done">Done</string> 88 <string name="emulation_done">Done</string>
89 <string name="emulation_toggle_controls">Toggle Controls</string> 89 <string name="emulation_toggle_controls">Toggle Controls</string>
90 <string name="emulation_rel_stick_center">Relative Stick Center</string>
90 <string name="emulation_toggle_all">Toggle All</string> 91 <string name="emulation_toggle_all">Toggle All</string>
91 <string name="emulation_control_scale">Adjust Scale</string> 92 <string name="emulation_control_scale">Adjust Scale</string>
92 <string name="emulation_touch_overlay_reset">Reset Overlay</string> 93 <string name="emulation_touch_overlay_reset">Reset Overlay</string>