Android: Convert stereo settings to floats to match C++ definitions

These settings were recently changed with 113c86f1b4661c7e300d3867cd26ed26b2640f2a to be floats instead of ints.

This commit also changes the Android UI to use the direct convergence value instead of the percentage to match the Qt UI.

3 files changed, 17 insertions, 20 deletions

diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/model/FloatSetting.kt b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/model/FloatSetting.kt
index d6e6be05c4..67ea46195c 100644
--- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/model/FloatSetting.kt
+++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/model/FloatSetting.kt
@@ -12,7 +12,9 @@ enum class FloatSetting(
     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),
     MAIN_VI_OVERCLOCK(Settings.FILE_DOLPHIN, Settings.SECTION_INI_CORE, "VIOverclock", 1.0f),
-    GFX_CC_GAME_GAMMA(Settings.FILE_GFX, Settings.SECTION_GFX_COLOR_CORRECTION, "GameGamma", 2.35f);
+    GFX_CC_GAME_GAMMA(Settings.FILE_GFX, Settings.SECTION_GFX_COLOR_CORRECTION, "GameGamma", 2.35f),
+    GFX_STEREO_DEPTH(Settings.FILE_GFX, Settings.SECTION_STEREOSCOPY, "StereoDepth", 20.0f),
+    GFX_STEREO_CONVERGENCE(Settings.FILE_GFX, Settings.SECTION_STEREOSCOPY, "StereoConvergence", 20.0f);
 
     override val isOverridden: Boolean
         get() = NativeConfig.isOverridden(file, section, key)
diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/model/IntSetting.kt b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/model/IntSetting.kt
index 946b267207..faf9f71ea0 100644
--- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/model/IntSetting.kt
+++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/model/IntSetting.kt
@@ -127,13 +127,6 @@ enum class IntSetting(
         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
-    ),
     GFX_PERF_SAMP_WINDOW(
         Settings.FILE_GFX,
         Settings.SECTION_GFX_SETTINGS,
diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/ui/SettingsFragmentPresenter.kt b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/ui/SettingsFragmentPresenter.kt
index 977f2aeff6..a47901debb 100644
--- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/ui/SettingsFragmentPresenter.kt
+++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/ui/SettingsFragmentPresenter.kt
@@ -2181,27 +2181,29 @@ class SettingsFragmentPresenter(
             )
         )
         sl.add(
-            IntSliderSetting(
+            FloatSliderSetting(
                 context,
-                IntSetting.GFX_STEREO_DEPTH,
+                FloatSetting.GFX_STEREO_DEPTH,
                 R.string.stereoscopy_depth,
                 R.string.stereoscopy_depth_description,
-                0,
-                100,
-                "%",
-                1
+                0f,
+                100f,
+                "",
+                1f,
+                false
             )
         )
         sl.add(
-            IntSliderSetting(
+            FloatSliderSetting(
                 context,
-                IntSetting.GFX_STEREO_CONVERGENCE_PERCENTAGE,
+                FloatSetting.GFX_STEREO_CONVERGENCE,
                 R.string.stereoscopy_convergence,
                 R.string.stereoscopy_convergence_description,
-                0,
-                200,
-                "%",
-                1
+                0f,
+                200f,
+                "",
+                0.01f,
+                true
             )
         )
         sl.add(