diff options
| author | JMC47 <JMC4789@gmail.com> | 2022-07-23 06:31:29 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-07-23 06:31:29 -0400 |
| commit | fdecd56ec751f4d8de88b5ef50dd48a9bd069160 (patch) | |
| tree | fae65739ba24088c7177900c68f8e51d462be78e /Source/Android | |
| parent | 89c4fdeeea69056a8f2441f6e0e0662ba1e6a7b8 (diff) | |
| parent | c0cf6f04dd384599aba8ccf57d2b144cab6e7568 (diff) | |
Merge pull request #10884 from JosJuice/android-bba-tapless
Android: Add "Broadband Adapter (Built In)" to settings
Diffstat (limited to 'Source/Android')
4 files changed, 14 insertions, 1 deletions
diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/model/StringSetting.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/model/StringSetting.java index 751d18f90f..4c4a74da84 100644 --- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/model/StringSetting.java +++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/model/StringSetting.java @@ -17,6 +17,10 @@ public enum StringSetting implements AbstractStringSetting MAIN_BBA_MAC(Settings.FILE_DOLPHIN, Settings.SECTION_INI_CORE, "BBA_MAC", ""), MAIN_BBA_XLINK_IP(Settings.FILE_DOLPHIN, Settings.SECTION_INI_CORE, "BBA_XLINK_IP", ""), + // Schthack PSO Server - https://schtserv.com/ + MAIN_BBA_BUILTIN_DNS(Settings.FILE_DOLPHIN, Settings.SECTION_INI_CORE, "BBA_BUILTIN_DNS", + "149.56.167.128"), + MAIN_GFX_BACKEND(Settings.FILE_DOLPHIN, Settings.SECTION_INI_CORE, "GFXBackend", NativeLibrary.GetDefaultGraphicsBackendName()), diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/ui/SettingsFragmentPresenter.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/ui/SettingsFragmentPresenter.java index ae45cb96ad..dd3fb15506 100644 --- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/ui/SettingsFragmentPresenter.java +++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/ui/SettingsFragmentPresenter.java @@ -577,12 +577,17 @@ public final class SettingsFragmentPresenter private void addSerialPortSubSettings(ArrayList<SettingsItem> sl, int serialPort1Type) { - if (serialPort1Type == 10) // XLink Kai + if (serialPort1Type == 10) // Broadband Adapter (XLink Kai) { sl.add(new HyperLinkHeaderSetting(mContext, R.string.xlink_kai_guide_header, 0)); sl.add(new InputStringSetting(mContext, StringSetting.MAIN_BBA_XLINK_IP, R.string.xlink_kai_bba_ip, R.string.xlink_kai_bba_ip_description)); } + else if (serialPort1Type == 12) // Broadband Adapter (Built In) + { + sl.add(new InputStringSetting(mContext, StringSetting.MAIN_BBA_BUILTIN_DNS, + R.string.bba_builtin_dns, R.string.bba_builtin_dns_description)); + } } private void addGcPadSettings(ArrayList<SettingsItem> sl) diff --git a/Source/Android/app/src/main/res/values/arrays.xml b/Source/Android/app/src/main/res/values/arrays.xml index ff8050b9cb..edce6273aa 100644 --- a/Source/Android/app/src/main/res/values/arrays.xml +++ b/Source/Android/app/src/main/res/values/arrays.xml @@ -102,11 +102,13 @@ <item>Nothing</item> <item>Dummy</item> <item>Broadband Adapter (XLink Kai)</item> + <item>Broadband Adapter (Built In)</item> </string-array> <integer-array name="serialPort1DeviceValues" translatable="false"> <item>255</item> <item>0</item> <item>10</item> + <item>12</item> </integer-array> <!-- GameCube 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 e7b1318b82..e28cc082c0 100644 --- a/Source/Android/app/src/main/res/values/strings.xml +++ b/Source/Android/app/src/main/res/values/strings.xml @@ -166,6 +166,8 @@ <string name="xlink_kai_guide_header">For setup instructions, <a href="https://www.teamxlink.co.uk/wiki/Dolphin">refer to this page.</a></string> <string name="xlink_kai_bba_ip">XLink Kai IP Address/hostname</string> <string name="xlink_kai_bba_ip_description">IP address or hostname of device running the XLink Kai client</string> + <string name="bba_builtin_dns">DNS Server</string> + <string name="bba_builtin_dns_description">Use 8.8.8.8 for normal DNS, else enter your custom one</string> <!-- Interface Preference Fragment --> <string name="interface_submenu">Interface</string> |