Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
[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.
  • Loading branch information
lioncash committed Sep 2, 2013
1 parent 71fde87 commit acf3bd8
Showing 1 changed file with 3 additions and 5 deletions.
Expand Up @@ -207,22 +207,21 @@ public void onCreate(Bundle savedInstanceState)
// 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"))
{
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
Expand All @@ -239,14 +238,13 @@ public void onSharedPreferenceChanged(SharedPreferences preference, String key)
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);
}
}
}
Expand Down

0 comments on commit acf3bd8

Please sign in to comment.