diff options
| author | Lioncash <mathew1800@gmail.com> | 2013-08-20 20:28:48 -0400 |
|---|---|---|
| committer | Lioncash <mathew1800@gmail.com> | 2013-08-20 20:28:48 -0400 |
| commit | e52c2ac3375571fe7dc98d07687c3a69d9012dc1 (patch) | |
| tree | 58d659bec62744f036663679dc18196e49bb75db /Source/Android/src/org | |
| parent | 9170c9b360809a7adfe4b757ff8ec65c6ef62a61 (diff) | |
[Android] Migrate the "Draw Onscreen Controls" preference to the video settings.
Diffstat (limited to 'Source/Android/src/org')
| -rw-r--r-- | Source/Android/src/org/dolphinemu/dolphinemu/inputconfig/InputConfigFragment.java | 1 | ||||
| -rw-r--r-- | Source/Android/src/org/dolphinemu/dolphinemu/settings/UserPreferences.java | 8 |
2 files changed, 7 insertions, 2 deletions
diff --git a/Source/Android/src/org/dolphinemu/dolphinemu/inputconfig/InputConfigFragment.java b/Source/Android/src/org/dolphinemu/dolphinemu/inputconfig/InputConfigFragment.java index 00794f3ea0..420d5796fa 100644 --- a/Source/Android/src/org/dolphinemu/dolphinemu/inputconfig/InputConfigFragment.java +++ b/Source/Android/src/org/dolphinemu/dolphinemu/inputconfig/InputConfigFragment.java @@ -55,7 +55,6 @@ public final class InputConfigFragment extends Fragment public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { List<InputConfigItem> Input = new ArrayList<InputConfigItem>(); - Input.add(new InputConfigItem(getString(R.string.draw_onscreen_controls), "Android-ScreenControls", "True")); Input.add(new InputConfigItem(getString(R.string.button_a), "Android-InputA")); Input.add(new InputConfigItem(getString(R.string.button_b), "Android-InputB")); Input.add(new InputConfigItem(getString(R.string.button_start), "Android-InputStart")); diff --git a/Source/Android/src/org/dolphinemu/dolphinemu/settings/UserPreferences.java b/Source/Android/src/org/dolphinemu/dolphinemu/settings/UserPreferences.java index 0bf8535492..225e8b4f3b 100644 --- a/Source/Android/src/org/dolphinemu/dolphinemu/settings/UserPreferences.java +++ b/Source/Android/src/org/dolphinemu/dolphinemu/settings/UserPreferences.java @@ -36,7 +36,9 @@ public final class UserPreferences // Add the settings. editor.putString("cpuCorePref", getConfig("Dolphin.ini", "Core", "CPUCore", "3")); editor.putBoolean("dualCorePref", getConfig("Dolphin.ini", "Core", "CPUThread", "False").equals("True")); - editor.putString("gpuPref", getConfig("Dolphin.ini", "Core", "GFXBackend ", "Software Renderer")); + + editor.putString("gpuPref", getConfig("Dolphin.ini", "Core", "GFXBackend ", "Software Renderer")); + editor.putString("drawOnscreenControls", getConfig("Dolphin.ini", "Android", "ScreenControls", "True")); editor.putString("internalResolution", getConfig("gfx_opengl.ini", "Settings", "EFBScale", "2") ); editor.putString("anisotropicFiltering", getConfig("gfx_opengl.ini", "Enhancements", "MaxAnisotropy", "0")); @@ -118,6 +120,9 @@ public final class UserPreferences // Current video backend being used. Falls back to software rendering upon error. String currentVideoBackend = prefs.getString("gpuPref", "Software Rendering"); + // Whether or not to draw on-screen controls. + boolean drawingOnscreenControls = prefs.getBoolean("drawOnscreenControls", true); + // Whether or not to ignore all EFB access requests from the CPU. boolean skipEFBAccess = prefs.getBoolean("skipEFBAccess", false); @@ -167,6 +172,7 @@ public final class UserPreferences // General Video Settings NativeLibrary.SetConfig("Dolphin.ini", "Core", "GFXBackend", currentVideoBackend); + NativeLibrary.SetConfig("Dolphin.ini", "Android", "ScreenControls", drawingOnscreenControls ? "True" : "False"); // Video Hack Settings NativeLibrary.SetConfig("gfx_opengl.ini", "Hacks", "EFBAccessEnable", skipEFBAccess ? "False" : "True"); |