mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-01-30 12:32:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #397 from lioncash/master

Browse Source 
Misc cleanup
This commit is contained in:
Squarepusher 2013-11-25 07:42:38 -08:00
commit d55972542b
4 changed files with 33 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
android/phoenix/src/com/retroarch/browser/CoreSelection.java
View File

@ -27,6 +27,16 @@ public final class CoreSelection extends DialogFragment
{
private IconAdapter<ModuleWrapper> adapter;
/**
* Creates a statically instantiated instance of CoreSelection.
*
* @return a statically instantiated instance of CoreSelection.
*/
public static CoreSelection newInstance()
{
return new CoreSelection();
}
@Override
public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState)
{

12
android/phoenix/src/com/retroarch/browser/DisplayRefreshRateTest.java
View File

@ -34,13 +34,13 @@ public final class DisplayRefreshRateTest extends Activity {
private int mState = STATE_START;
private double mStartTime = 0.0;
private int mNumFrames = 0;
private Activity activity;
public Renderer(Activity activity) {
this.activity = activity;
}
private void setFPSSetting(double fps) {
SharedPreferences prefs = UserPreferences.getPreferences(DisplayRefreshRateTest.this);
SharedPreferences.Editor edit = prefs.edit();
@ -107,20 +107,18 @@ public final class DisplayRefreshRateTest extends Activity {
}
}
private GLSurfaceView surfaceView;
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
Toast.makeText(this, R.string.touch_screen_with_fingers, Toast.LENGTH_LONG).show();
surfaceView = new GLSurfaceView(this);
final GLSurfaceView surfaceView = new GLSurfaceView(this);
surfaceView.setEGLContextClientVersion(2);
surfaceView.setRenderer(new Renderer(this));
getWindow().addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON);
setTitle(R.string.refresh_rate_calibration);
setContentView(surfaceView);
}
@Override
protected void onDestroy() {
SharedPreferences prefs = UserPreferences.getPreferences(this);

10
android/phoenix/src/com/retroarch/browser/HistorySelection.java
View File

@ -33,6 +33,16 @@ public final class HistorySelection extends DialogFragment
private FragmentActivity ctx;
private IconAdapter<HistoryWrapper> adapter;
/**
* Creates a statically instantiated instance of HistorySelection.
*
* @return a statically instantiated instance of HistorySelection.
*/
public static HistorySelection newInstance()
{
return new HistorySelection();
}
@Override
public void onCreate(Bundle savedInstanceState)
{

18
android/phoenix/src/com/retroarch/browser/mainmenu/MainMenuFragment.java
View File

@ -347,14 +347,7 @@ public final class MainMenuFragment extends PreferenceListFragment implements On
// Load Core Preference
else if (prefKey.equals("loadCorePref"))
{
final CoreSelection coreSelection = new CoreSelection();
coreSelection.show(getFragmentManager(), "core_selection");
}
// Quit RetroArch preference
else if (prefKey.equals("quitRetroArch"))
{
// TODO - needs to close entire app gracefully - including
// NativeActivity if possible
CoreSelection.newInstance().show(getFragmentManager(), "core_selection");
}
// Load ROM Preference
else if (prefKey.equals("loadRomPref"))
@ -382,8 +375,13 @@ public final class MainMenuFragment extends PreferenceListFragment implements On
// Load ROM (History) Preference
else if (prefKey.equals("loadRomHistoryPref"))
{
final HistorySelection historySelection = new HistorySelection();
historySelection.show(getFragmentManager(), "history_selection");
HistorySelection.newInstance().show(getFragmentManager(), "history_selection");
}
// Quit RetroArch preference
else if (prefKey.equals("quitRetroArch"))
{
// TODO - needs to close entire app gracefully - including
// NativeActivity if possible
}
return true;