summaryrefslogtreecommitdiff
path: root/src/android
diff options
context:
space:
mode:
authorGravatar GPUCode2023-11-23 11:26:06 +0200
committerGravatar t8952023-11-25 00:47:43 -0500
commit9ff8d0f3e652fee83d9f4374d9f6e0aa1759dd88 (patch)
treed3bf69c51eab1e4c56db1615ecf5193aa76badcc /src/android
parentloader: apply nso patch to offset program image (diff)
downloadyuzu-9ff8d0f3e652fee83d9f4374d9f6e0aa1759dd88.tar.gz
yuzu-9ff8d0f3e652fee83d9f4374d9f6e0aa1759dd88.tar.xz
yuzu-9ff8d0f3e652fee83d9f4374d9f6e0aa1759dd88.zip
Address more review comments
Diffstat (limited to 'src/android')
-rw-r--r--src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/model/view/SettingsItem.kt4
-rw-r--r--src/android/app/src/main/res/values/arrays.xml12
-rw-r--r--src/android/app/src/main/res/values/strings.xml2
3 files changed, 13 insertions, 5 deletions
diff --git a/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/model/view/SettingsItem.kt b/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/model/view/SettingsItem.kt
index 1f090424b..e198b18a0 100644
--- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/model/view/SettingsItem.kt
+++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/model/view/SettingsItem.kt
@@ -82,8 +82,8 @@ abstract class SettingsItem(
82 IntSetting.CPU_BACKEND, 82 IntSetting.CPU_BACKEND,
83 R.string.cpu_backend, 83 R.string.cpu_backend,
84 0, 84 0,
85 R.array.cpuBackendNames, 85 R.array.cpuBackendArm64Names,
86 R.array.cpuBackendValues 86 R.array.cpuBackendArm64Values
87 ) 87 )
88 ) 88 )
89 put( 89 put(
diff --git a/src/android/app/src/main/res/values/arrays.xml b/src/android/app/src/main/res/values/arrays.xml
index 2756e5cc9..ab435dce9 100644
--- a/src/android/app/src/main/res/values/arrays.xml
+++ b/src/android/app/src/main/res/values/arrays.xml
@@ -175,16 +175,24 @@
175 <item>2</item> 175 <item>2</item>
176 </integer-array> 176 </integer-array>
177 177
178 <string-array name="cpuBackendNames"> 178 <string-array name="cpuBackendArm64Names">
179 <item>@string/cpu_backend_dynarmic</item> 179 <item>@string/cpu_backend_dynarmic</item>
180 <item>@string/cpu_backend_nce</item> 180 <item>@string/cpu_backend_nce</item>
181 </string-array> 181 </string-array>
182 182
183 <integer-array name="cpuBackendValues"> 183 <integer-array name="cpuBackendArm64Values">
184 <item>0</item> 184 <item>0</item>
185 <item>1</item> 185 <item>1</item>
186 </integer-array> 186 </integer-array>
187 187
188 <string-array name="cpuBackendX86Names">
189 <item>@string/cpu_backend_dynarmic</item>
190 </string-array>
191
192 <integer-array name="cpuBackendX86Values">
193 <item>0</item>
194 </integer-array>
195
188 <string-array name="cpuAccuracyNames"> 196 <string-array name="cpuAccuracyNames">
189 <item>@string/auto</item> 197 <item>@string/auto</item>
190 <item>@string/cpu_accuracy_accurate</item> 198 <item>@string/cpu_accuracy_accurate</item>
diff --git a/src/android/app/src/main/res/values/strings.xml b/src/android/app/src/main/res/values/strings.xml
index f07121f6a..95b90fd6d 100644
--- a/src/android/app/src/main/res/values/strings.xml
+++ b/src/android/app/src/main/res/values/strings.xml
@@ -185,7 +185,7 @@
185 <string name="frame_limit_enable_description">Limits emulation speed to a specified percentage of normal speed.</string> 185 <string name="frame_limit_enable_description">Limits emulation speed to a specified percentage of normal speed.</string>
186 <string name="frame_limit_slider">Limit speed percent</string> 186 <string name="frame_limit_slider">Limit speed percent</string>
187 <string name="frame_limit_slider_description">Specifies the percentage to limit emulation speed. 100% is the normal speed. Values higher or lower will increase or decrease the speed limit.</string> 187 <string name="frame_limit_slider_description">Specifies the percentage to limit emulation speed. 100% is the normal speed. Values higher or lower will increase or decrease the speed limit.</string>
188 <string name="cpu_backend">CPU Backend</string> 188 <string name="cpu_backend">CPU backend</string>
189 <string name="cpu_accuracy">CPU accuracy</string> 189 <string name="cpu_accuracy">CPU accuracy</string>
190 <string name="value_with_units">%1$s%2$s</string> 190 <string name="value_with_units">%1$s%2$s</string>
191 191