Android: Centralize default values for settings

I was hoping we would be able to pull in the default values
from C++, but it seems like more trouble than it's worth,
partially because of different settings having default values
of different types and partially because we don't have any
convenient way to get a list of all C++ settings.

Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/NativeLibrary.java

@@ -335,6 +335,8 @@ public final class NativeLibrary
 
   public static native int DefaultCPUCore();
 
+  public static native String GetDefaultGraphicsBackendName();
+
   public static native int GetMaxLogLevel();
 
   public static native void ReloadConfig();

Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/activities/EmulationActivity.java

@@ -33,7 +33,6 @@ import androidx.fragment.app.FragmentManager;
 
 import org.dolphinemu.dolphinemu.NativeLibrary;
 import org.dolphinemu.dolphinemu.R;
-import org.dolphinemu.dolphinemu.features.settings.model.Setting;
 import org.dolphinemu.dolphinemu.features.settings.model.Settings;
 import org.dolphinemu.dolphinemu.features.settings.utils.SettingsFile;
 import org.dolphinemu.dolphinemu.fragments.EmulationFragment;

Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/dialogs/GamePropertiesDialog.java

@@ -9,8 +9,8 @@ import androidx.appcompat.app.AlertDialog;
 import androidx.fragment.app.DialogFragment;
 
 import org.dolphinemu.dolphinemu.R;
-import org.dolphinemu.dolphinemu.features.settings.model.Setting;
 import org.dolphinemu.dolphinemu.features.settings.model.Settings;
+import org.dolphinemu.dolphinemu.features.settings.model.StringSetting;
 import org.dolphinemu.dolphinemu.features.settings.ui.MenuTag;
 import org.dolphinemu.dolphinemu.features.settings.ui.SettingsActivity;
 import org.dolphinemu.dolphinemu.ui.platform.Platform;
@@ -65,7 +65,7 @@ public class GamePropertiesDialog extends DialogFragment
                 case 1:
                   Settings settings = new Settings();
                   settings.loadSettings(null);
-                  Setting.MAIN_DEFAULT_ISO.setString(settings, path);
+                  StringSetting.MAIN_DEFAULT_ISO.setString(settings, path);
                   settings.saveSettings(null, getContext());
                   break;
                 case 2:

Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/model/AbstractBooleanSetting.java

@@ -0,0 +1,8 @@
+package org.dolphinemu.dolphinemu.features.settings.model;
+
+public interface AbstractBooleanSetting extends AbstractSetting
+{
+  boolean getBoolean(Settings settings);
+
+  void setBoolean(Settings settings, boolean newValue);
+}

Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/model/AbstractFloatSetting.java

@@ -0,0 +1,8 @@
+package org.dolphinemu.dolphinemu.features.settings.model;
+
+public interface AbstractFloatSetting extends AbstractSetting
+{
+  float getFloat(Settings settings);
+
+  void setFloat(Settings settings, float newValue);
+}

Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/model/AbstractIntSetting.java

@@ -0,0 +1,8 @@
+package org.dolphinemu.dolphinemu.features.settings.model;
+
+public interface AbstractIntSetting extends AbstractSetting
+{
+  int getInt(Settings settings);
+
+  void setInt(Settings settings, int newValue);
+}

Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/model/AbstractLegacySetting.java

@@ -0,0 +1,21 @@
+package org.dolphinemu.dolphinemu.features.settings.model;
+
+public class AbstractLegacySetting implements AbstractSetting
+{
+  protected final String mFile;
+  protected final String mSection;
+  protected final String mKey;
+
+  public AbstractLegacySetting(String file, String section, String key)
+  {
+    mFile = file;
+    mSection = section;
+    mKey = key;
+  }
+
+  @Override
+  public boolean delete(Settings settings)
+  {
+    return settings.getSection(mFile, mSection).delete(mKey);
+  }
+}

Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/model/AbstractStringSetting.java

@@ -0,0 +1,8 @@
+package org.dolphinemu.dolphinemu.features.settings.model;
+
+public interface AbstractStringSetting extends AbstractSetting
+{
+  String getString(Settings settings);
+
+  void setString(Settings settings, String newValue);
+}

Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/model/BooleanSetting.java

@@ -1,8 +1,127 @@
 package org.dolphinemu.dolphinemu.features.settings.model;
 
-public interface BooleanSetting extends AbstractSetting
+public enum BooleanSetting implements AbstractBooleanSetting
 {
-  boolean getBoolean(Settings settings, boolean defaultValue);
+  // These entries have the same names and order as in C++, just for consistency.
 
-  void setBoolean(Settings settings, boolean newValue);
+  MAIN_DSP_HLE(Settings.FILE_DOLPHIN, Settings.SECTION_INI_CORE, "DSPHLE", true),
+  MAIN_CPU_THREAD(Settings.FILE_DOLPHIN, Settings.SECTION_INI_CORE, "CPUThread", true),
+  MAIN_OVERRIDE_REGION_SETTINGS(Settings.FILE_DOLPHIN, Settings.SECTION_INI_CORE,
+          "OverrideRegionSettings", false),
+  MAIN_AUDIO_STRETCH(Settings.FILE_DOLPHIN, Settings.SECTION_INI_CORE, "AudioStretch", false),
+  MAIN_WII_SD_CARD(Settings.FILE_DOLPHIN, Settings.SECTION_INI_CORE, "WiiSDCard", true),
+  MAIN_WIIMOTE_CONTINUOUS_SCANNING(Settings.FILE_DOLPHIN, Settings.SECTION_INI_CORE,
+          "WiimoteContinuousScanning", false),
+  MAIN_WIIMOTE_ENABLE_SPEAKER(Settings.FILE_DOLPHIN, Settings.SECTION_INI_CORE,
+          "WiimoteEnableSpeaker", 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),
+  MAIN_ALLOW_SD_WRITES(Settings.FILE_DOLPHIN, Settings.SECTION_INI_CORE, "WiiSDCardAllowWrites",
+          true),
+  MAIN_ENABLE_SAVESTATES(Settings.FILE_DOLPHIN, Settings.SECTION_INI_CORE, "EnableSaveStates",
+          false),
+
+  MAIN_DSP_JIT(Settings.FILE_DOLPHIN, Settings.SECTION_INI_DSP, "EnableJIT", true),
+
+  MAIN_USE_PANIC_HANDLERS(Settings.FILE_DOLPHIN, Settings.SECTION_INI_INTERFACE,
+          "UsePanicHandlers", true),
+  MAIN_OSD_MESSAGES(Settings.FILE_DOLPHIN, Settings.SECTION_INI_INTERFACE,
+          "OnScreenDisplayMessages", true),
+
+  MAIN_ANALYTICS_ENABLED(Settings.FILE_DOLPHIN, Settings.SECTION_ANALYTICS, "Enabled", false),
+  MAIN_ANALYTICS_PERMISSION_ASKED(Settings.FILE_DOLPHIN, Settings.SECTION_ANALYTICS,
+          "PermissionAsked", false),
+
+  MAIN_RECURSIVE_ISO_PATHS(Settings.FILE_DOLPHIN, Settings.SECTION_INI_GENERAL,
+          "RecursiveISOPaths", false),
+
+  GFX_WIDESCREEN_HACK(Settings.FILE_GFX, Settings.SECTION_GFX_SETTINGS, "wideScreenHack", false),
+  GFX_SHOW_FPS(Settings.FILE_GFX, Settings.SECTION_GFX_SETTINGS, "ShowFPS", false),
+  GFX_ENABLE_GPU_TEXTURE_DECODING(Settings.FILE_GFX, Settings.SECTION_GFX_SETTINGS,
+          "EnableGPUTextureDecoding", false),
+  GFX_ENABLE_PIXEL_LIGHTING(Settings.FILE_GFX, Settings.SECTION_GFX_SETTINGS,
+          "EnablePixelLighting", false),
+  GFX_FAST_DEPTH_CALC(Settings.FILE_GFX, Settings.SECTION_GFX_SETTINGS, "FastDepthCalc", true),
+  GFX_DISABLE_FOG(Settings.FILE_GFX, Settings.SECTION_GFX_SETTINGS, "DisableFog", false),
+  GFX_BACKEND_MULTITHREADING(Settings.FILE_GFX, Settings.SECTION_GFX_SETTINGS,
+          "BackendMultithreading", false),
+  GFX_WAIT_FOR_SHADERS_BEFORE_STARTING(Settings.FILE_GFX, Settings.SECTION_GFX_SETTINGS,
+          "WaitForShadersBeforeStarting", false),
+
+  GFX_ENHANCE_FORCE_FILTERING(Settings.FILE_GFX, Settings.SECTION_GFX_ENHANCEMENTS,
+          "ForceFiltering", false),
+  GFX_ENHANCE_FORCE_TRUE_COLOR(Settings.FILE_GFX, Settings.SECTION_GFX_ENHANCEMENTS,
+          "ForceTrueColor", true),
+  GFX_ENHANCE_DISABLE_COPY_FILTER(Settings.FILE_GFX, Settings.SECTION_GFX_ENHANCEMENTS,
+          "DisableCopyFilter", true),
+  GFX_ENHANCE_ARBITRARY_MIPMAP_DETECTION(Settings.FILE_GFX, Settings.SECTION_GFX_ENHANCEMENTS,
+          "ArbitraryMipmapDetection", true),
+
+  GFX_STEREO_SWAP_EYES(Settings.FILE_GFX, Settings.SECTION_STEREOSCOPY, "StereoSwapEyes", false),
+
+  GFX_HACK_EFB_ACCESS_ENABLE(Settings.FILE_GFX, Settings.SECTION_GFX_HACKS, "EFBAccessEnable",
+          true),
+  GFX_HACK_SKIP_EFB_COPY_TO_RAM(Settings.FILE_GFX, Settings.SECTION_GFX_HACKS,
+          "EFBToTextureEnable", true),
+  GFX_HACK_SKIP_XFB_COPY_TO_RAM(Settings.FILE_GFX, Settings.SECTION_GFX_HACKS,
+          "XFBToTextureEnable", true),
+  GFX_HACK_DEFER_EFB_COPIES(Settings.FILE_GFX, Settings.SECTION_GFX_HACKS, "DeferEFBCopies", true),
+  GFX_HACK_IMMEDIATE_XFB(Settings.FILE_GFX, Settings.SECTION_GFX_HACKS, "ImmediateXFBEnable",
+          false),
+  GFX_HACK_SKIP_DUPLICATE_XFBS(Settings.FILE_GFX, Settings.SECTION_GFX_HACKS, "SkipDuplicateXFBs",
+          true),
+  GFX_HACK_COPY_EFB_SCALED(Settings.FILE_GFX, Settings.SECTION_GFX_HACKS, "EFBScaledCopy", true),
+  GFX_HACK_EFB_EMULATE_FORMAT_CHANGES(Settings.FILE_GFX, Settings.SECTION_GFX_HACKS,
+          "EFBEmulateFormatChanges", false),
+
+  LOGGER_WRITE_TO_FILE(Settings.FILE_LOGGER, Settings.SECTION_LOGGER_OPTIONS, "WriteToFile", false),
+
+  // These settings are not yet in the new config system in C++ - please move them once they are
+
+  MAIN_JIT_OFF(Settings.FILE_DOLPHIN, Settings.SECTION_DEBUG, "JitOff", false),
+  MAIN_JIT_LOAD_STORE_OFF(Settings.FILE_DOLPHIN, Settings.SECTION_DEBUG, "JitLoadStoreOff", false),
+  MAIN_JIT_LOAD_STORE_FLOATING_OFF(Settings.FILE_DOLPHIN, Settings.SECTION_DEBUG,
+          "JitLoadStoreFloatingOff", false),
+  MAIN_JIT_LOAD_STORE_PAIRED_OFF(Settings.FILE_DOLPHIN, Settings.SECTION_DEBUG,
+          "JitLoadStorePairedOff", false),
+  MAIN_JIT_FLOATING_POINT_OFF(Settings.FILE_DOLPHIN, Settings.SECTION_DEBUG, "JitFloatingPointOff",
+          false),
+  MAIN_JIT_INTEGER_OFF(Settings.FILE_DOLPHIN, Settings.SECTION_DEBUG, "JitIntegerOff", false),
+  MAIN_JIT_PAIRED_OFF(Settings.FILE_DOLPHIN, Settings.SECTION_DEBUG, "JitPairedOff", false),
+  MAIN_JIT_SYSTEM_REGISTERS_OFF(Settings.FILE_DOLPHIN, Settings.SECTION_DEBUG,
+          "JitSystemRegistersOff", false),
+  MAIN_JIT_BRANCH_OFF(Settings.FILE_DOLPHIN, Settings.SECTION_DEBUG, "JitBranchOff", false),
+  MAIN_JIT_REGISTER_CACHE_OFF(Settings.FILE_DOLPHIN, Settings.SECTION_DEBUG, "JitRegisterCacheOff",
+          false);
+
+  private final String mFile;
+  private final String mSection;
+  private final String mKey;
+  private final boolean mDefaultValue;
+
+  BooleanSetting(String file, String section, String key, boolean defaultValue)
+  {
+    mFile = file;
+    mSection = section;
+    mKey = key;
+    mDefaultValue = defaultValue;
+  }
+
+  @Override
+  public boolean delete(Settings settings)
+  {
+    return settings.getSection(mFile, mSection).delete(mKey);
+  }
+
+  @Override
+  public boolean getBoolean(Settings settings)
+  {
+    return settings.getSection(mFile, mSection).getBoolean(mKey, mDefaultValue);
+  }
+
+  @Override
+  public void setBoolean(Settings settings, boolean newValue)
+  {
+    settings.getSection(mFile, mSection).setBoolean(mKey, newValue);
+  }
 }

Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/model/FloatSetting.java

@@ -1,8 +1,40 @@
 package org.dolphinemu.dolphinemu.features.settings.model;
 
-public interface FloatSetting extends AbstractSetting
+public enum FloatSetting implements AbstractFloatSetting
 {
-  float getFloat(Settings settings, float defaultValue);
+  // These entries have the same names and order as in C++, just for consistency.
 
-  void setFloat(Settings settings, float newValue);
+  MAIN_EMULATION_SPEED(Settings.FILE_DOLPHIN, Settings.SECTION_INI_CORE, "EmulationSpeed", 1.0f),
+  MAIN_OVERCLOCK(Settings.FILE_DOLPHIN, Settings.SECTION_INI_CORE, "Overclock", 1.0f);
+
+  private final String mFile;
+  private final String mSection;
+  private final String mKey;
+  private final float mDefaultValue;
+
+  FloatSetting(String file, String section, String key, float defaultValue)
+  {
+    mFile = file;
+    mSection = section;
+    mKey = key;
+    mDefaultValue = defaultValue;
+  }
+
+  @Override
+  public boolean delete(Settings settings)
+  {
+    return settings.getSection(mFile, mSection).delete(mKey);
+  }
+
+  @Override
+  public float getFloat(Settings settings)
+  {
+    return settings.getSection(mFile, mSection).getFloat(mKey, mDefaultValue);
+  }
+
+  @Override
+  public void setFloat(Settings settings, float newValue)
+  {
+    settings.getSection(mFile, mSection).setFloat(mKey, newValue);
+  }
 }

Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/model/IntSetting.java

@@ -1,8 +1,67 @@
 package org.dolphinemu.dolphinemu.features.settings.model;
 
-public interface IntSetting extends AbstractSetting
-{
-  int getInt(Settings settings, int defaultValue);
+import org.dolphinemu.dolphinemu.NativeLibrary;
 
-  void setInt(Settings settings, int newValue);
+public enum IntSetting implements AbstractIntSetting
+{
+  // These entries have the same names and order as in C++, just for consistency.
+
+  MAIN_CPU_CORE(Settings.FILE_DOLPHIN, Settings.SECTION_INI_CORE, "CPUCore",
+          NativeLibrary.DefaultCPUCore()),
+  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_AUDIO_VOLUME(Settings.FILE_DOLPHIN, Settings.SECTION_INI_DSP, "Volume", 100),
+
+  MAIN_LAST_PLATFORM_TAB(Settings.FILE_DOLPHIN, Settings.SECTION_INI_ANDROID, "LastPlatformTab", 0),
+
+  GFX_ASPECT_RATIO(Settings.FILE_GFX, Settings.SECTION_GFX_SETTINGS, "AspectRatio", 0),
+  GFX_SAFE_TEXTURE_CACHE_COLOR_SAMPLES(Settings.FILE_GFX, Settings.SECTION_GFX_SETTINGS,
+          "SafeTextureCacheColorSamples", 128),
+  GFX_MSAA(Settings.FILE_GFX, Settings.SECTION_GFX_SETTINGS, "MSAA", 1),
+  GFX_EFB_SCALE(Settings.FILE_GFX, Settings.SECTION_GFX_SETTINGS, "InternalResolution", 1),
+  GFX_SHADER_COMPILATION_MODE(Settings.FILE_GFX, Settings.SECTION_GFX_SETTINGS,
+          "ShaderCompilationMode", 0),
+
+  GFX_ENHANCE_MAX_ANISOTROPY(Settings.FILE_GFX, Settings.SECTION_GFX_ENHANCEMENTS, "MaxAnisotropy",
+          0),
+
+  GFX_STEREO_MODE(Settings.FILE_GFX, Settings.SECTION_STEREOSCOPY, "StereoMode", 0),
+  GFX_STEREO_DEPTH(Settings.FILE_GFX, Settings.SECTION_STEREOSCOPY, "StereoDepth", 20),
+  GFX_STEREO_CONVERGENCE_PERCENTAGE(Settings.FILE_GFX, Settings.SECTION_STEREOSCOPY,
+          "StereoConvergencePercentage", 100),
+
+  LOGGER_VERBOSITY(Settings.FILE_LOGGER, Settings.SECTION_LOGGER_OPTIONS, "Verbosity", 1);
+
+  private final String mFile;
+  private final String mSection;
+  private final String mKey;
+  private final int mDefaultValue;
+
+  IntSetting(String file, String section, String key, int defaultValue)
+  {
+    mFile = file;
+    mSection = section;
+    mKey = key;
+    mDefaultValue = defaultValue;
+  }
+
+  @Override
+  public boolean delete(Settings settings)
+  {
+    return settings.getSection(mFile, mSection).delete(mKey);
+  }
+
+  @Override
+  public int getInt(Settings settings)
+  {
+    return settings.getSection(mFile, mSection).getInt(mKey, mDefaultValue);
+  }
+
+  @Override
+  public void setInt(Settings settings, int newValue)
+  {
+    settings.getSection(mFile, mSection).setInt(mKey, newValue);
+  }
 }

Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/model/LegacyBooleanSetting.java

@@ -0,0 +1,24 @@
+package org.dolphinemu.dolphinemu.features.settings.model;
+
+public class LegacyBooleanSetting extends AbstractLegacySetting implements AbstractBooleanSetting
+{
+  private final boolean mDefaultValue;
+
+  public LegacyBooleanSetting(String file, String section, String key, boolean defaultValue)
+  {
+    super(file, section, key);
+    mDefaultValue = defaultValue;
+  }
+
+  @Override
+  public boolean getBoolean(Settings settings)
+  {
+    return settings.getSection(mFile, mSection).getBoolean(mKey, mDefaultValue);
+  }
+
+  @Override
+  public void setBoolean(Settings settings, boolean newValue)
+  {
+    settings.getSection(mFile, mSection).setBoolean(mKey, newValue);
+  }
+}

Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/model/LegacyFloatSetting.java

@@ -0,0 +1,24 @@
+package org.dolphinemu.dolphinemu.features.settings.model;
+
+public class LegacyFloatSetting extends AbstractLegacySetting implements AbstractFloatSetting
+{
+  private final float mDefaultValue;
+
+  public LegacyFloatSetting(String file, String section, String key, float defaultValue)
+  {
+    super(file, section, key);
+    mDefaultValue = defaultValue;
+  }
+
+  @Override
+  public float getFloat(Settings settings)
+  {
+    return settings.getSection(mFile, mSection).getFloat(mKey, mDefaultValue);
+  }
+
+  @Override
+  public void setFloat(Settings settings, float newValue)
+  {
+    settings.getSection(mFile, mSection).setFloat(mKey, newValue);
+  }
+}

Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/model/LegacyIntSetting.java

@@ -0,0 +1,24 @@
+package org.dolphinemu.dolphinemu.features.settings.model;
+
+public class LegacyIntSetting extends AbstractLegacySetting implements AbstractIntSetting
+{
+  private final int mDefaultValue;
+
+  public LegacyIntSetting(String file, String section, String key, int defaultValue)
+  {
+    super(file, section, key);
+    mDefaultValue = defaultValue;
+  }
+
+  @Override
+  public int getInt(Settings settings)
+  {
+    return settings.getSection(mFile, mSection).getInt(mKey, mDefaultValue);
+  }
+
+  @Override
+  public void setInt(Settings settings, int newValue)
+  {
+    settings.getSection(mFile, mSection).setInt(mKey, newValue);
+  }
+}

Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/model/LegacySetting.java

@@ -1,69 +0,0 @@
-package org.dolphinemu.dolphinemu.features.settings.model;
-
-public class LegacySetting implements StringSetting, BooleanSetting, IntSetting, FloatSetting
-{
-  private final String mFile;
-  private final String mSection;
-  private final String mKey;
-
-  public LegacySetting(String file, String section, String key)
-  {
-    mFile = file;
-    mSection = section;
-    mKey = key;
-  }
-
-  @Override
-  public boolean delete(Settings settings)
-  {
-    return settings.getSection(mFile, mSection).delete(mKey);
-  }
-
-  @Override
-  public String getString(Settings settings, String defaultValue)
-  {
-    return settings.getSection(mFile, mSection).getString(mKey, defaultValue);
-  }
-
-  @Override
-  public boolean getBoolean(Settings settings, boolean defaultValue)
-  {
-    return settings.getSection(mFile, mSection).getBoolean(mKey, defaultValue);
-  }
-
-  @Override
-  public int getInt(Settings settings, int defaultValue)
-  {
-    return settings.getSection(mFile, mSection).getInt(mKey, defaultValue);
-  }
-
-  @Override
-  public float getFloat(Settings settings, float defaultValue)
-  {
-    return settings.getSection(mFile, mSection).getFloat(mKey, defaultValue);
-  }
-
-  @Override
-  public void setString(Settings settings, String newValue)
-  {
-    settings.getSection(mFile, mSection).setString(mKey, newValue);
-  }
-
-  @Override
-  public void setBoolean(Settings settings, boolean newValue)
-  {
-    settings.getSection(mFile, mSection).setBoolean(mKey, newValue);
-  }
-
-  @Override
-  public void setInt(Settings settings, int newValue)
-  {
-    settings.getSection(mFile, mSection).setInt(mKey, newValue);
-  }
-
-  @Override
-  public void setFloat(Settings settings, float newValue)
-  {
-    settings.getSection(mFile, mSection).setFloat(mKey, newValue);
-  }
-}

Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/model/LegacyStringSetting.java

@@ -0,0 +1,24 @@
+package org.dolphinemu.dolphinemu.features.settings.model;
+
+public class LegacyStringSetting extends AbstractLegacySetting implements AbstractStringSetting
+{
+  private final String mDefaultValue;
+
+  public LegacyStringSetting(String file, String section, String key, String defaultValue)
+  {
+    super(file, section, key);
+    mDefaultValue = defaultValue;
+  }
+
+  @Override
+  public String getString(Settings settings)
+  {
+    return settings.getSection(mFile, mSection).getString(mKey, mDefaultValue);
+  }
+
+  @Override
+  public void setString(Settings settings, String newValue)
+  {
+    settings.getSection(mFile, mSection).setString(mKey, newValue);
+  }
+}

Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/model/Setting.java

@@ -1,186 +0,0 @@
-package org.dolphinemu.dolphinemu.features.settings.model;
-
-public enum Setting implements StringSetting, BooleanSetting, IntSetting, FloatSetting
-{
-  // These entries have the same names and order as in C++, just for consistency.
-
-  MAIN_CPU_CORE(Settings.FILE_DOLPHIN, Settings.SECTION_INI_CORE, "CPUCore"),
-  MAIN_DSP_HLE(Settings.FILE_DOLPHIN, Settings.SECTION_INI_CORE, "DSPHLE"),
-  MAIN_CPU_THREAD(Settings.FILE_DOLPHIN, Settings.SECTION_INI_CORE, "CPUThread"),
-  MAIN_DEFAULT_ISO(Settings.FILE_DOLPHIN, Settings.SECTION_INI_CORE, "DefaultISO"),
-  MAIN_GC_LANGUAGE(Settings.FILE_DOLPHIN, Settings.SECTION_INI_CORE, "SelectedLanguage"),
-  MAIN_OVERRIDE_REGION_SETTINGS(Settings.FILE_DOLPHIN, Settings.SECTION_INI_CORE,
-          "OverrideRegionSettings"),
-  MAIN_AUDIO_STRETCH(Settings.FILE_DOLPHIN, Settings.SECTION_INI_CORE, "AudioStretch"),
-  MAIN_SLOT_A(Settings.FILE_DOLPHIN, Settings.SECTION_INI_CORE, "SlotA"),
-  MAIN_SLOT_B(Settings.FILE_DOLPHIN, Settings.SECTION_INI_CORE, "SlotB"),
-  MAIN_WII_SD_CARD(Settings.FILE_DOLPHIN, Settings.SECTION_INI_CORE, "WiiSDCard"),
-  MAIN_WIIMOTE_CONTINUOUS_SCANNING(Settings.FILE_DOLPHIN, Settings.SECTION_INI_CORE,
-          "WiimoteContinuousScanning"),
-  MAIN_WIIMOTE_ENABLE_SPEAKER(Settings.FILE_DOLPHIN, Settings.SECTION_INI_CORE,
-          "WiimoteEnableSpeaker"),
-  MAIN_EMULATION_SPEED(Settings.FILE_DOLPHIN, Settings.SECTION_INI_CORE, "EmulationSpeed"),
-  MAIN_OVERCLOCK(Settings.FILE_DOLPHIN, Settings.SECTION_INI_CORE, "Overclock"),
-  MAIN_OVERCLOCK_ENABLE(Settings.FILE_DOLPHIN, Settings.SECTION_INI_CORE, "OverclockEnable"),
-  MAIN_GFX_BACKEND(Settings.FILE_DOLPHIN, Settings.SECTION_INI_CORE, "GFXBackend"),
-  MAIN_AUTO_DISC_CHANGE(Settings.FILE_DOLPHIN, Settings.SECTION_INI_CORE, "AutoDiscChange"),
-  MAIN_ALLOW_SD_WRITES(Settings.FILE_DOLPHIN, Settings.SECTION_INI_CORE, "WiiSDCardAllowWrites"),
-  MAIN_ENABLE_SAVESTATES(Settings.FILE_DOLPHIN, Settings.SECTION_INI_CORE, "EnableSaveStates"),
-
-  MAIN_DSP_JIT(Settings.FILE_DOLPHIN, Settings.SECTION_INI_DSP, "EnableJIT"),
-  MAIN_AUDIO_VOLUME(Settings.FILE_DOLPHIN, Settings.SECTION_INI_DSP, "Volume"),
-
-  MAIN_DUMP_PATH(Settings.FILE_DOLPHIN, Settings.SECTION_INI_GENERAL, "DumpPath"),
-  MAIN_LOAD_PATH(Settings.FILE_DOLPHIN, Settings.SECTION_INI_GENERAL, "LoadPath"),
-  MAIN_RESOURCEPACK_PATH(Settings.FILE_DOLPHIN, Settings.SECTION_INI_GENERAL, "ResourcePackPath"),
-  MAIN_FS_PATH(Settings.FILE_DOLPHIN, Settings.SECTION_INI_GENERAL, "NANDRootPath"),
-  MAIN_SD_PATH(Settings.FILE_DOLPHIN, Settings.SECTION_INI_GENERAL, "WiiSDCardPath"),
-
-  MAIN_USE_PANIC_HANDLERS(Settings.FILE_DOLPHIN, Settings.SECTION_INI_INTERFACE,
-          "UsePanicHandlers"),
-  MAIN_OSD_MESSAGES(Settings.FILE_DOLPHIN, Settings.SECTION_INI_INTERFACE,
-          "OnScreenDisplayMessages"),
-
-  MAIN_ANALYTICS_ENABLED(Settings.FILE_DOLPHIN, Settings.SECTION_ANALYTICS, "Enabled"),
-  MAIN_ANALYTICS_PERMISSION_ASKED(Settings.FILE_DOLPHIN, Settings.SECTION_ANALYTICS,
-          "PermissionAsked"),
-
-  MAIN_RECURSIVE_ISO_PATHS(Settings.FILE_DOLPHIN, Settings.SECTION_INI_GENERAL,
-          "RecursiveISOPaths"),
-
-  MAIN_LAST_PLATFORM_TAB(Settings.FILE_DOLPHIN, Settings.SECTION_INI_ANDROID, "LastPlatformTab"),
-
-  GFX_WIDESCREEN_HACK(Settings.FILE_GFX, Settings.SECTION_GFX_SETTINGS, "wideScreenHack"),
-  GFX_ASPECT_RATIO(Settings.FILE_GFX, Settings.SECTION_GFX_SETTINGS, "AspectRatio"),
-  GFX_SAFE_TEXTURE_CACHE_COLOR_SAMPLES(Settings.FILE_GFX, Settings.SECTION_GFX_SETTINGS,
-          "SafeTextureCacheColorSamples"),
-  GFX_SHOW_FPS(Settings.FILE_GFX, Settings.SECTION_GFX_SETTINGS, "ShowFPS"),
-  GFX_ENABLE_GPU_TEXTURE_DECODING(Settings.FILE_GFX, Settings.SECTION_GFX_SETTINGS,
-          "EnableGPUTextureDecoding"),
-  GFX_ENABLE_PIXEL_LIGHTING(Settings.FILE_GFX, Settings.SECTION_GFX_SETTINGS,
-          "EnablePixelLighting"),
-  GFX_FAST_DEPTH_CALC(Settings.FILE_GFX, Settings.SECTION_GFX_SETTINGS, "FastDepthCalc"),
-  GFX_MSAA(Settings.FILE_GFX, Settings.SECTION_GFX_SETTINGS, "MSAA"),
-  GFX_EFB_SCALE(Settings.FILE_GFX, Settings.SECTION_GFX_SETTINGS, "InternalResolution"),
-  GFX_DISABLE_FOG(Settings.FILE_GFX, Settings.SECTION_GFX_SETTINGS, "DisableFog"),
-  GFX_BACKEND_MULTITHREADING(Settings.FILE_GFX, Settings.SECTION_GFX_SETTINGS,
-          "BackendMultithreading"),
-  GFX_WAIT_FOR_SHADERS_BEFORE_STARTING(Settings.FILE_GFX, Settings.SECTION_GFX_SETTINGS,
-          "WaitForShadersBeforeStarting"),
-  GFX_SHADER_COMPILATION_MODE(Settings.FILE_GFX, Settings.SECTION_GFX_SETTINGS,
-          "ShaderCompilationMode"),
-
-  GFX_ENHANCE_FORCE_FILTERING(Settings.FILE_GFX, Settings.SECTION_GFX_ENHANCEMENTS,
-          "ForceFiltering"),
-  GFX_ENHANCE_MAX_ANISOTROPY(Settings.FILE_GFX, Settings.SECTION_GFX_ENHANCEMENTS, "MaxAnisotropy"),
-  GFX_ENHANCE_POST_SHADER(Settings.FILE_GFX, Settings.SECTION_GFX_ENHANCEMENTS,
-          "PostProcessingShader"),
-  GFX_ENHANCE_FORCE_TRUE_COLOR(Settings.FILE_GFX, Settings.SECTION_GFX_ENHANCEMENTS,
-          "ForceTrueColor"),
-  GFX_ENHANCE_DISABLE_COPY_FILTER(Settings.FILE_GFX, Settings.SECTION_GFX_ENHANCEMENTS,
-          "DisableCopyFilter"),
-  GFX_ENHANCE_ARBITRARY_MIPMAP_DETECTION(Settings.FILE_GFX, Settings.SECTION_GFX_ENHANCEMENTS,
-          "ArbitraryMipmapDetection"),
-
-  GFX_STEREO_MODE(Settings.FILE_GFX, Settings.SECTION_STEREOSCOPY, "StereoMode"),
-  GFX_STEREO_DEPTH(Settings.FILE_GFX, Settings.SECTION_STEREOSCOPY, "StereoDepth"),
-  GFX_STEREO_CONVERGENCE_PERCENTAGE(Settings.FILE_GFX, Settings.SECTION_STEREOSCOPY,
-          "StereoConvergencePercentage"),
-  GFX_STEREO_SWAP_EYES(Settings.FILE_GFX, Settings.SECTION_STEREOSCOPY, "StereoSwapEyes"),
-
-  GFX_HACK_EFB_ACCESS_ENABLE(Settings.FILE_GFX, Settings.SECTION_GFX_HACKS, "EFBAccessEnable"),
-  GFX_HACK_SKIP_EFB_COPY_TO_RAM(Settings.FILE_GFX, Settings.SECTION_GFX_HACKS,
-          "EFBToTextureEnable"),
-  GFX_HACK_SKIP_XFB_COPY_TO_RAM(Settings.FILE_GFX, Settings.SECTION_GFX_HACKS,
-          "XFBToTextureEnable"),
-  GFX_HACK_DEFER_EFB_COPIES(Settings.FILE_GFX, Settings.SECTION_GFX_HACKS, "DeferEFBCopies"),
-  GFX_HACK_IMMEDIATE_XFB(Settings.FILE_GFX, Settings.SECTION_GFX_HACKS, "ImmediateXFBEnable"),
-  GFX_HACK_SKIP_DUPLICATE_XFBS(Settings.FILE_GFX, Settings.SECTION_GFX_HACKS, "SkipDuplicateXFBs"),
-  GFX_HACK_COPY_EFB_SCALED(Settings.FILE_GFX, Settings.SECTION_GFX_HACKS, "EFBScaledCopy"),
-  GFX_HACK_EFB_EMULATE_FORMAT_CHANGES(Settings.FILE_GFX, Settings.SECTION_GFX_HACKS,
-          "EFBEmulateFormatChanges"),
-
-  LOGGER_WRITE_TO_FILE(Settings.FILE_LOGGER, Settings.SECTION_LOGGER_OPTIONS, "WriteToFile"),
-  LOGGER_VERBOSITY(Settings.FILE_LOGGER, Settings.SECTION_LOGGER_OPTIONS, "Verbosity"),
-
-  // These settings are not yet in the new config system in C++ - please move them once they are
-
-  MAIN_JIT_OFF(Settings.FILE_DOLPHIN, Settings.SECTION_DEBUG, "JitOff"),
-  MAIN_JIT_LOAD_STORE_OFF(Settings.FILE_DOLPHIN, Settings.SECTION_DEBUG, "JitLoadStoreOff"),
-  MAIN_JIT_LOAD_STORE_FLOATING_OFF(Settings.FILE_DOLPHIN, Settings.SECTION_DEBUG,
-          "JitLoadStoreFloatingOff"),
-  MAIN_JIT_LOAD_STORE_PAIRED_OFF(Settings.FILE_DOLPHIN, Settings.SECTION_DEBUG,
-          "JitLoadStorePairedOff"),
-  MAIN_JIT_FLOATING_POINT_OFF(Settings.FILE_DOLPHIN, Settings.SECTION_DEBUG, "JitFloatingPointOff"),
-  MAIN_JIT_INTEGER_OFF(Settings.FILE_DOLPHIN, Settings.SECTION_DEBUG, "JitIntegerOff"),
-  MAIN_JIT_PAIRED_OFF(Settings.FILE_DOLPHIN, Settings.SECTION_DEBUG, "JitPairedOff"),
-  MAIN_JIT_SYSTEM_REGISTERS_OFF(Settings.FILE_DOLPHIN, Settings.SECTION_DEBUG,
-          "JitSystemRegistersOff"),
-  MAIN_JIT_BRANCH_OFF(Settings.FILE_DOLPHIN, Settings.SECTION_DEBUG, "JitBranchOff"),
-  MAIN_JIT_REGISTER_CACHE_OFF(Settings.FILE_DOLPHIN, Settings.SECTION_DEBUG, "JitRegisterCacheOff");
-
-  private final String mFile;
-  private final String mSection;
-  private final String mKey;
-
-  Setting(String file, String section, String key)
-  {
-    mFile = file;
-    mSection = section;
-    mKey = key;
-  }
-
-  @Override
-  public boolean delete(Settings settings)
-  {
-    return settings.getSection(mFile, mSection).delete(mKey);
-  }
-
-  @Override
-  public String getString(Settings settings, String defaultValue)
-  {
-    return settings.getSection(mFile, mSection).getString(mKey, defaultValue);
-  }
-
-  @Override
-  public boolean getBoolean(Settings settings, boolean defaultValue)
-  {
-    return settings.getSection(mFile, mSection).getBoolean(mKey, defaultValue);
-  }
-
-  @Override
-  public int getInt(Settings settings, int defaultValue)
-  {
-    return settings.getSection(mFile, mSection).getInt(mKey, defaultValue);
-  }
-
-  @Override
-  public float getFloat(Settings settings, float defaultValue)
-  {
-    return settings.getSection(mFile, mSection).getFloat(mKey, defaultValue);
-  }
-
-  @Override
-  public void setString(Settings settings, String newValue)
-  {
-    settings.getSection(mFile, mSection).setString(mKey, newValue);
-  }
-
-  @Override
-  public void setBoolean(Settings settings, boolean newValue)
-  {
-    settings.getSection(mFile, mSection).setBoolean(mKey, newValue);
-  }
-
-  @Override
-  public void setInt(Settings settings, int newValue)
-  {
-    settings.getSection(mFile, mSection).setInt(mKey, newValue);
-  }
-
-  @Override
-  public void setFloat(Settings settings, float newValue)
-  {
-    settings.getSection(mFile, mSection).setFloat(mKey, newValue);
-  }
-}

Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/model/Settings.java

@@ -96,7 +96,7 @@ public class Settings
       loadCustomGameSettings(gameId, view);
     }
 
-    mLoadedRecursiveIsoPathsValue = Setting.MAIN_RECURSIVE_ISO_PATHS.getBoolean(this, false);
+    mLoadedRecursiveIsoPathsValue = BooleanSetting.MAIN_RECURSIVE_ISO_PATHS.getBoolean(this);
   }
 
   private void loadDolphinSettings(SettingsActivityView view)
@@ -145,7 +145,7 @@ public class Settings
       NativeLibrary.ReloadLoggerConfig();
       NativeLibrary.UpdateGCAdapterScanThread();
 
-      if (mLoadedRecursiveIsoPathsValue != Setting.MAIN_RECURSIVE_ISO_PATHS.getBoolean(this, false))
+      if (mLoadedRecursiveIsoPathsValue != BooleanSetting.MAIN_RECURSIVE_ISO_PATHS.getBoolean(this))
       {
         // Refresh game library
         GameFileCacheService.startRescan(context);

Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/model/StringSetting.java

@@ -1,8 +1,53 @@
 package org.dolphinemu.dolphinemu.features.settings.model;
 
-public interface StringSetting extends AbstractSetting
-{
-  String getString(Settings settings, String defaultValue);
+import org.dolphinemu.dolphinemu.NativeLibrary;
 
-  void setString(Settings settings, String newValue);
+public enum StringSetting implements AbstractStringSetting
+{
+  // These entries have the same names and order as in C++, just for consistency.
+
+  MAIN_DEFAULT_ISO(Settings.FILE_DOLPHIN, Settings.SECTION_INI_CORE, "DefaultISO", ""),
+  MAIN_GFX_BACKEND(Settings.FILE_DOLPHIN, Settings.SECTION_INI_CORE, "GFXBackend",
+          NativeLibrary.GetDefaultGraphicsBackendName()),
+
+  MAIN_DUMP_PATH(Settings.FILE_DOLPHIN, Settings.SECTION_INI_GENERAL, "DumpPath", ""),
+  MAIN_LOAD_PATH(Settings.FILE_DOLPHIN, Settings.SECTION_INI_GENERAL, "LoadPath", ""),
+  MAIN_RESOURCEPACK_PATH(Settings.FILE_DOLPHIN, Settings.SECTION_INI_GENERAL, "ResourcePackPath",
+          ""),
+  MAIN_FS_PATH(Settings.FILE_DOLPHIN, Settings.SECTION_INI_GENERAL, "NANDRootPath", ""),
+  MAIN_SD_PATH(Settings.FILE_DOLPHIN, Settings.SECTION_INI_GENERAL, "WiiSDCardPath", ""),
+
+  GFX_ENHANCE_POST_SHADER(Settings.FILE_GFX, Settings.SECTION_GFX_ENHANCEMENTS,
+          "PostProcessingShader", "");
+
+  private final String mFile;
+  private final String mSection;
+  private final String mKey;
+  private final String mDefaultValue;
+
+  StringSetting(String file, String section, String key, String defaultValue)
+  {
+    mFile = file;
+    mSection = section;
+    mKey = key;
+    mDefaultValue = defaultValue;
+  }
+
+  @Override
+  public boolean delete(Settings settings)
+  {
+    return settings.getSection(mFile, mSection).delete(mKey);
+  }
+
+  @Override
+  public String getString(Settings settings)
+  {
+    return settings.getSection(mFile, mSection).getString(mKey, mDefaultValue);
+  }
+
+  @Override
+  public void setString(Settings settings, String newValue)
+  {
+    settings.getSection(mFile, mSection).setString(mKey, newValue);
+  }
 }

Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/model/view/CheckBoxSetting.java

@@ -1,24 +1,21 @@
 package org.dolphinemu.dolphinemu.features.settings.model.view;
 
-import org.dolphinemu.dolphinemu.features.settings.model.BooleanSetting;
+import org.dolphinemu.dolphinemu.features.settings.model.AbstractBooleanSetting;
 import org.dolphinemu.dolphinemu.features.settings.model.Settings;
 
 public class CheckBoxSetting extends SettingsItem
 {
-  protected BooleanSetting mSetting;
-  protected boolean mDefaultValue;
+  protected AbstractBooleanSetting mSetting;
 
-  public CheckBoxSetting(BooleanSetting setting, int titleId, int descriptionId,
-          boolean defaultValue)
+  public CheckBoxSetting(AbstractBooleanSetting setting, int titleId, int descriptionId)
   {
     super(titleId, descriptionId);
     mSetting = setting;
-    mDefaultValue = defaultValue;
   }
 
   public boolean isChecked(Settings settings)
   {
-    return mSetting.getBoolean(settings, mDefaultValue);
+    return mSetting.getBoolean(settings);
   }
 
   public void setChecked(Settings settings, boolean checked)