summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authort895 <clombardo169@gmail.com>2023-12-29 22:55:00 +0100
committert895 <clombardo169@gmail.com>2023-12-30 21:11:36 +0100
commitaa4d15594f7bfd1c1aeb5d9ba40a59ff689e25e7 (patch)
tree34c74dbe922f695f5ed5c00f8094333d8ee68633
parentandroid: Don't apply material you below android 12 (diff)
downloadyuzu-aa4d15594f7bfd1c1aeb5d9ba40a59ff689e25e7.tar
yuzu-aa4d15594f7bfd1c1aeb5d9ba40a59ff689e25e7.tar.gz
yuzu-aa4d15594f7bfd1c1aeb5d9ba40a59ff689e25e7.tar.bz2
yuzu-aa4d15594f7bfd1c1aeb5d9ba40a59ff689e25e7.tar.lz
yuzu-aa4d15594f7bfd1c1aeb5d9ba40a59ff689e25e7.tar.xz
yuzu-aa4d15594f7bfd1c1aeb5d9ba40a59ff689e25e7.tar.zst
yuzu-aa4d15594f7bfd1c1aeb5d9ba40a59ff689e25e7.zip
Diffstat (limited to '')
-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 6e5dd1dba..510b2b5eb 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
@@ -539,6 +539,7 @@ class EmulationFragment : Fragment(), SurfaceHolder.Callback {
findItem(R.id.menu_show_overlay).isChecked =
BooleanSetting.SHOW_INPUT_OVERLAY.getBoolean()
findItem(R.id.menu_haptics).isChecked = BooleanSetting.HAPTIC_FEEDBACK.getBoolean()
+ findItem(R.id.menu_touchscreen).isChecked = BooleanSetting.TOUCHSCREEN.getBoolean()
}
popup.setOnMenuItemClickListener {
@@ -628,6 +629,12 @@ class EmulationFragment : Fragment(), SurfaceHolder.Callback {
true
}
+ R.id.menu_touchscreen -> {
+ it.isChecked = !it.isChecked
+ BooleanSetting.TOUCHSCREEN.setBoolean(it.isChecked)
+ true
+ }
+
R.id.menu_reset_overlay -> {
binding.drawerLayout.close()
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 4885b4f6f..363781652 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
@@ -39,6 +39,11 @@
android:checkable="true" />
<item
+ android:id="@+id/menu_touchscreen"
+ android:title="@string/touchscreen"
+ android:checkable="true" />
+
+ <item
android:id="@+id/menu_reset_overlay"
android:title="@string/emulation_touch_overlay_reset" />
diff --git a/src/android/app/src/main/res/values/strings.xml b/src/android/app/src/main/res/values/strings.xml
index 4d5c268fe..1bedcb1ef 100644
--- a/src/android/app/src/main/res/values/strings.xml
+++ b/src/android/app/src/main/res/values/strings.xml
@@ -366,6 +366,7 @@
<string name="emulation_pause">Pause emulation</string>
<string name="emulation_unpause">Unpause emulation</string>
<string name="emulation_input_overlay">Overlay options</string>
+ <string name="touchscreen">Touchscreen</string>
<string name="load_settings">Loading settings…</string>