diff options
| author | JMC47 <JMC4789@gmail.com> | 2020-04-16 18:27:51 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-16 18:27:51 -0400 |
| commit | 19fc43f190545fa5c5cb490a7cb34715db61430a (patch) | |
| tree | d5b8831da7818ec23c67ccd8e21171debdcb7c69 /Source/Android | |
| parent | 55ed980620d8b1b024379e99f37e39d00f28ebb2 (diff) | |
| parent | a3ff20a5f93d8ab6b246de9fde011fabd1d15e5c (diff) | |
Merge pull request #8708 from Ebola16/Wii
Android: Add Insert SD Card and update the description
Diffstat (limited to 'Source/Android')
3 files changed, 7 insertions, 0 deletions
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 d0db5c8a1c..b0f37299f5 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 @@ -378,13 +378,17 @@ public final class SettingsFragmentPresenter private void addWiiSettings(ArrayList<SettingsItem> sl) { + Setting wiiSDCard = null; Setting continuousScan = null; Setting wiimoteSpeaker = null; SettingSection coreSection = mSettings.getSection(Settings.SECTION_INI_CORE); + wiiSDCard = coreSection.getSetting(SettingsFile.KEY_WII_SD_CARD); continuousScan = coreSection.getSetting(SettingsFile.KEY_WIIMOTE_SCAN); wiimoteSpeaker = coreSection.getSetting(SettingsFile.KEY_WIIMOTE_SPEAKER); + sl.add(new CheckBoxSetting(SettingsFile.KEY_WII_SD_CARD, Settings.SECTION_INI_CORE, + R.string.insert_sd_card, R.string.insert_sd_card_description, false, wiiSDCard)); sl.add(new CheckBoxSetting(SettingsFile.KEY_WIIMOTE_SCAN, Settings.SECTION_INI_CORE, R.string.wiimote_scanning, R.string.wiimote_scanning_description, true, continuousScan)); diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/utils/SettingsFile.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/utils/SettingsFile.java index 629dc53be9..77c38b9f38 100644 --- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/utils/SettingsFile.java +++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/utils/SettingsFile.java @@ -273,6 +273,7 @@ public final class SettingsFile public static final String KEY_WIIBIND_TURNTABLE_CROSSFADE_LEFT = "TurntableCrossLeft_"; public static final String KEY_WIIBIND_TURNTABLE_CROSSFADE_RIGHT = "TurntableCrossRight_"; + public static final String KEY_WII_SD_CARD = "WiiSDCard"; public static final String KEY_WIIMOTE_SCAN = "WiimoteContinuousScanning"; public static final String KEY_WIIMOTE_SPEAKER = "WiimoteEnableSpeaker"; diff --git a/Source/Android/app/src/main/res/values/strings.xml b/Source/Android/app/src/main/res/values/strings.xml index df006410f1..74a6399d27 100644 --- a/Source/Android/app/src/main/res/values/strings.xml +++ b/Source/Android/app/src/main/res/values/strings.xml @@ -138,6 +138,8 @@ <string name="slot_a_device">GameCube Slot A Device</string> <string name="slot_b_device">GameCube Slot B Device</string> <string name="wii_submenu">Wii</string> + <string name="insert_sd_card">Insert SD Card</string> + <string name="insert_sd_card_description">Supports SD and SDHC. Default size is 128 MB.</string> <string name="wiimote_scanning">Wii Remote Continuous Scanning</string> <string name="wiimote_scanning_description">Leave this on if you are using a DolphinBar for real Wiimote support.</string> <string name="wiimote_speaker">Wii Remote Speaker</string> |