summaryrefslogtreecommitdiff
path: root/Source/Android
diff options
context:
space:
mode:
authorJosJuice <josjuice@gmail.com>2024-03-29 15:37:57 +0100
committerGitHub <noreply@github.com>2024-03-29 15:37:57 +0100
commitfbc3539b4e80253f84378d51210d29f77e67646d (patch)
tree0729b73c94c0dabb465ec7506abdbd39d1070f06 /Source/Android
parentf30d3c90926220a4bd4f747c9a2d20c5e52137e8 (diff)
parent39f559708926f815cdac624c27a05b67815079d6 (diff)
Merge pull request #12666 from Matt-Swift/master
Add tapserver BBA and Modem Adapter UI options to Android
Diffstat (limited to 'Source/Android')
-rw-r--r--Source/Android/app/src/main/res/values/arrays.xml4
-rw-r--r--Source/Android/app/src/main/res/values/strings.xml2
2 files changed, 6 insertions, 0 deletions
diff --git a/Source/Android/app/src/main/res/values/arrays.xml b/Source/Android/app/src/main/res/values/arrays.xml
index 2f8adeb60c..8892f7f218 100644
--- a/Source/Android/app/src/main/res/values/arrays.xml
+++ b/Source/Android/app/src/main/res/values/arrays.xml
@@ -103,12 +103,16 @@
<item>@string/device_dummy</item>
<item>@string/broadband_adapter_xlink</item>
<item>@string/broadband_adapter_hle</item>
+ <item>@string/broadband_adapter_tapserver</item>
+ <item>@string/modem_adapter_tapserver</item>
</string-array>
<integer-array name="serialPort1DeviceValues">
<item>255</item>
<item>0</item>
<item>10</item>
<item>12</item>
+ <item>11</item>
+ <item>13</item>
</integer-array>
<!-- Wii System Languages -->
diff --git a/Source/Android/app/src/main/res/values/strings.xml b/Source/Android/app/src/main/res/values/strings.xml
index 89ddc6b705..5dde637d7d 100644
--- a/Source/Android/app/src/main/res/values/strings.xml
+++ b/Source/Android/app/src/main/res/values/strings.xml
@@ -681,6 +681,8 @@ It can efficiently compress both junk data and encrypted Wii data.
<!-- Slot SP1 Device selection -->
<string name="broadband_adapter_xlink">Broadband Adapter (XLink Kai)</string>
<string name="broadband_adapter_hle">Broadband Adapter (HLE)</string>
+ <string name="broadband_adapter_tapserver">Broadband Adapter (tapserver)</string>
+ <string name="modem_adapter_tapserver">Modem Adapter (tapserver)</string>
<!-- Sound Mode -->
<string name="sound_mode_mono">Mono</string>