[Android] Change the settings menu a little more. Instead of the settings being a single view with settings from all components being displayed, I have broken it into sections. This future-proofs the settings menu in the sense that it won't get cluttered before people start asking "Hey, shouldn't this be broken into sections?".

As of this commit, it is broken into CPU Settings and Video Settings.
I also simplified the code that is responsible for setting the valid CPU cores and video backends by simply making UI string arrays that get chosen, based on the platform the Android device is running on.
This commit is contained in:
Lioncash
2013-08-19 19:10:13 -04:00
parent 814c1c9572
commit 77a5af3bcf
8 changed files with 115 additions and 82 deletions

View File

@ -0,0 +1,55 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- All lists for ListPreference keys/values are placed here -->
<resources>
<!-- CPU core selection - X86 -->
<string-array name="emuCoreEntriesX86" translatable="false">
<item>@string/interpreter</item>
<item>@string/jit64_recompiler</item>
<item>@string/jitil_recompiler</item>
</string-array>
<string-array name="emuCoreValuesX86" translatable="false">
<item>0</item>
<item>1</item>
<item>2</item>
</string-array>
<!-- CPU core selection - ARM -->
<string-array name="emuCoreEntriesARM" translatable="false">
<item>@string/interpreter</item>
<item>@string/jit_arm_recompiler</item>
</string-array>
<string-array name="emuCoreValuesARM" translatable="false">
<item>0</item>
<item>3</item>
</string-array>
<!-- CPU core selection - Other -->
<string-array name="emuCoreEntriesOther" translatable="false">
<item>@string/interpreter</item>
</string-array>
<string-array name="emuCoreValuesOther" translatable="false">
<item>0</item>
</string-array>
<!-- Video Backend Selection - Supports OpenGL ES 3 -->
<string-array name="videoBackendEntriesGLES3" translatable="false">
<item>@string/software_renderer</item>
<item>@string/opengl_es3</item>
</string-array>
<string-array name="videoBackendValuesGLES3" translatable="false">
<item>Software Renderer</item>
<item>OGL</item>
</string-array>
<!-- Video Backend Selection - No OpenGL ES 3 support -->
<string-array name="videoBackendEntriesNoGLES3">
<item>@string/software_renderer</item>
</string-array>
<string-array name="videoBackendValuesNoGLES3">
<item>Software Renderer</item>
</string-array>
</resources>

View File

@ -1,12 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<string-array name="gpuOptions" translatable="false">
<item>Software Renderer</item>
<item>OpenGL ES 3</item>
</string-array>
<string-array name="gpuValues" translatable="false">
<item>Software Renderer</item>
<item>OGL</item>
</string-array>
</resources>

View File

@ -73,6 +73,7 @@
<string name="video_settings">Video Settings</string>
<string name="software_renderer">Software Renderer</string>
<string name="opengl_es3">OpenGL ES 3</string>
<string name="video_backend">Video Backend</string>
<string name="video_backend_to_use">Video backend to use</string>