diff options
| author | Mai M <mathew1800@gmail.com> | 2021-11-21 04:49:07 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-11-21 04:49:07 -0500 |
| commit | 138847f98e137a20d7ad7b134d00be8899a23a76 (patch) | |
| tree | 826e59293f1365c95f28f8b0032243429b53d28a /Source/Android/app/src/main/java/org | |
| parent | e716349426ec0d4c6f90d68cc235daf8c63c419a (diff) | |
| parent | 77aa2cd04edb1a18f42cf14351a6c2dafa8ff02b (diff) | |
Merge pull request #10239 from JosJuice/android-mmu
Android: Add MMU setting to GUI
Diffstat (limited to 'Source/Android/app/src/main/java/org')
2 files changed, 6 insertions, 2 deletions
diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/model/BooleanSetting.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/model/BooleanSetting.java index 7423bf3db6..e062fd513e 100644 --- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/model/BooleanSetting.java +++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/model/BooleanSetting.java @@ -23,6 +23,7 @@ public enum BooleanSetting implements AbstractBooleanSetting "WiimoteContinuousScanning", false), MAIN_WIIMOTE_ENABLE_SPEAKER(Settings.FILE_DOLPHIN, Settings.SECTION_INI_CORE, "WiimoteEnableSpeaker", false), + MAIN_MMU(Settings.FILE_DOLPHIN, Settings.SECTION_INI_CORE, "MMU", false), MAIN_SYNC_GPU(Settings.FILE_DOLPHIN, Settings.SECTION_INI_CORE, "SyncGPU", false), MAIN_OVERCLOCK_ENABLE(Settings.FILE_DOLPHIN, Settings.SECTION_INI_CORE, "OverclockEnable", false), MAIN_AUTO_DISC_CHANGE(Settings.FILE_DOLPHIN, Settings.SECTION_INI_CORE, "AutoDiscChange", false), @@ -226,8 +227,9 @@ public enum BooleanSetting implements AbstractBooleanSetting MAIN_CPU_THREAD, MAIN_ENABLE_CHEATS, MAIN_OVERRIDE_REGION_SETTINGS, - MAIN_WII_SD_CARD, // Can actually be changed, but specific code is required - MAIN_DSP_JIT + MAIN_WII_SD_CARD, // Can actually be changed, but specialized code is required + MAIN_MMU, + MAIN_DSP_JIT, }; private static final Set<BooleanSetting> NOT_RUNTIME_EDITABLE = 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 c9f4a31712..865ce4e38d 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 @@ -544,6 +544,8 @@ public final class SettingsFragmentPresenter } sl.add(new SingleChoiceSetting(mContext, IntSetting.MAIN_CPU_CORE, R.string.cpu_core, 0, emuCoresEntries, emuCoresValues)); + sl.add(new CheckBoxSetting(mContext, BooleanSetting.MAIN_MMU, R.string.mmu_enable, + R.string.mmu_enable_description)); sl.add(new CheckBoxSetting(mContext, BooleanSetting.MAIN_OVERCLOCK_ENABLE, R.string.overclock_enable, R.string.overclock_enable_description)); sl.add(new PercentSliderSetting(mContext, FloatSetting.MAIN_OVERCLOCK, R.string.overclock_title, |