diff options
| author | JMC47 <JMC4789@gmail.com> | 2021-07-05 00:26:41 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-07-05 00:26:41 -0400 |
| commit | 4808241648b729e9640c19ffe9936a50e55c4fce (patch) | |
| tree | a4736ed990ca5b9cc138f5085751ac130cbb17c7 /Source/Android/app/src/main/java | |
| parent | 2409d30f5cec08e5402f87e831dc3021819cbcca (diff) | |
| parent | 515d02fe26f3cd74a792f518ab5b244c0210540b (diff) | |
Merge pull request #9843 from JosJuice/android-fallback-region
Android: Add Fallback Region setting to GUI
Diffstat (limited to 'Source/Android/app/src/main/java')
2 files changed, 3 insertions, 0 deletions
diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/model/IntSetting.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/model/IntSetting.java index 02df4c36a3..4f5b8d1e82 100644 --- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/model/IntSetting.java +++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/model/IntSetting.java @@ -18,6 +18,7 @@ public enum IntSetting implements AbstractIntSetting MAIN_GC_LANGUAGE(Settings.FILE_DOLPHIN, Settings.SECTION_INI_CORE, "SelectedLanguage", 0), MAIN_SLOT_A(Settings.FILE_DOLPHIN, Settings.SECTION_INI_CORE, "SlotA", 8), MAIN_SLOT_B(Settings.FILE_DOLPHIN, Settings.SECTION_INI_CORE, "SlotB", 255), + MAIN_FALLBACK_REGION(Settings.FILE_DOLPHIN, Settings.SECTION_INI_CORE, "FallbackRegion", 2), MAIN_AUDIO_VOLUME(Settings.FILE_DOLPHIN, Settings.SECTION_INI_DSP, "Volume", 100), 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 af16420b7f..28acad2f47 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 @@ -262,6 +262,8 @@ public final class SettingsFragmentPresenter R.string.auto_disc_change, 0)); sl.add(new PercentSliderSetting(mContext, FloatSetting.MAIN_EMULATION_SPEED, R.string.speed_limit, 0, 0, 200, "%")); + sl.add(new SingleChoiceSetting(mContext, IntSetting.MAIN_FALLBACK_REGION, + R.string.fallback_region, 0, R.array.regionEntries, R.array.regionValues)); sl.add(new CheckBoxSetting(mContext, BooleanSetting.MAIN_ANALYTICS_ENABLED, R.string.analytics, 0)); sl.add(new RunRunnable(mContext, R.string.analytics_new_id, 0, |