diff options
| author | Lioncash <mathew1800@gmail.com> | 2013-09-01 20:31:45 -0400 |
|---|---|---|
| committer | Lioncash <mathew1800@gmail.com> | 2013-09-01 20:31:45 -0400 |
| commit | acf3bd8697b323774ab21f24e6bc95ba2e29529d (patch) | |
| tree | 54a3b989c4684cdc46486ab964515370e68b0035 /Source/Android | |
| parent | 71fde876df2273152c6299675572a09e08e6ffce (diff) | |
[Android] On-screen controls work for Software Renderer, but not the OpenGL ES 3 video backend yet. Enabled it for Software Rendering and disabled it for Open GL ES 3.
Diffstat (limited to 'Source/Android')
| -rw-r--r-- | Source/Android/src/org/dolphinemu/dolphinemu/settings/VideoSettingsFragment.java | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/Source/Android/src/org/dolphinemu/dolphinemu/settings/VideoSettingsFragment.java b/Source/Android/src/org/dolphinemu/dolphinemu/settings/VideoSettingsFragment.java index fdaec5df01..cde3bf755d 100644 --- a/Source/Android/src/org/dolphinemu/dolphinemu/settings/VideoSettingsFragment.java +++ b/Source/Android/src/org/dolphinemu/dolphinemu/settings/VideoSettingsFragment.java @@ -207,7 +207,7 @@ public final class VideoSettingsFragment extends PreferenceFragment // denotes the placement on the UI. So if more elements are // added to the video settings, these may need to change. // - final SharedPreferences sPrefs = PreferenceManager.getDefaultSharedPreferences(getActivity()); + final SharedPreferences sPrefs = PreferenceManager.getDefaultSharedPreferences(m_activity); final PreferenceScreen mainScreen = getPreferenceScreen(); if (videoBackends.getValue().equals("Software Renderer")) @@ -215,14 +215,13 @@ public final class VideoSettingsFragment extends PreferenceFragment mainScreen.getPreference(0).setEnabled(false); mainScreen.getPreference(1).setEnabled(false); mainScreen.getPreference(3).setEnabled(false); - mainScreen.getPreference(4).setEnabled(false); } else if (videoBackends.getValue().equals("OGL")) { mainScreen.getPreference(0).setEnabled(true); mainScreen.getPreference(1).setEnabled(true); mainScreen.getPreference(3).setEnabled(true); - mainScreen.getPreference(4).setEnabled(true); + mainScreen.getPreference(4).setEnabled(false); } // Also set a listener, so that if someone changes the video backend, it will disable @@ -239,14 +238,13 @@ public final class VideoSettingsFragment extends PreferenceFragment mainScreen.getPreference(0).setEnabled(false); mainScreen.getPreference(1).setEnabled(false); mainScreen.getPreference(3).setEnabled(false); - mainScreen.getPreference(4).setEnabled(false); } else if (preference.getString(key, "Software Renderer").equals("OGL")) { mainScreen.getPreference(0).setEnabled(true); mainScreen.getPreference(1).setEnabled(true); mainScreen.getPreference(3).setEnabled(true); - mainScreen.getPreference(4).setEnabled(true); + mainScreen.getPreference(4).setEnabled(false); } } } |