From c84a61d83fcca3b8381a2f1cd1a6b60aa380698b Mon Sep 17 00:00:00 2001 From: twinaphex Date: Mon, 5 Aug 2013 23:00:01 +0200 Subject: [PATCH] (Android Java) Add more core descriptions (Android Java) Take out non-working Shield autoconfiguration stuff for now --- android/phoenix/assets/libretro_cores.cfg | 7 ++++++- .../src/org/retroarch/browser/RetroArch.java | 13 +------------ 2 files changed, 7 insertions(+), 13 deletions(-) diff --git a/android/phoenix/assets/libretro_cores.cfg b/android/phoenix/assets/libretro_cores.cfg index 9da2e2eb2e..468fbf0ae3 100644 --- a/android/phoenix/assets/libretro_cores.cfg +++ b/android/phoenix/assets/libretro_cores.cfg @@ -4,18 +4,23 @@ libretro_fceumm = "FCEUmm (Nintendo NES)" libretro_mednafen_vb = "Mednafen VB (Virtual Boy)" libretro_fba = "Final Burn Alpha (Arcade)" libretro_mednafen_ngp = "Mednafen NGP (Neo-Geo Pocket)" +libretro_mednafen_psx = "Mednafen PSX (PlayStation1)" libretro_gambatte = "Gambatte (GameBoy/GameBoy Color)" libretro_genesis_plus_gx = "Genesis Plus GX (Sega Genesis/Sega CD/Master System)" libretro_picodrive = "Picodrive (Sega Genesis/Sega CD/Master System/32X)" libretro_vba_next = "VBA Next (GameBoy Advance)" libretro_prboom = "PrBoom (DOOM)" -libretro_snes9x_next = "Snes9x-Next (Nintendo SNES)" +libretro_snes9x = "SNES9x (Nintendo SNES)" +libretro_snes9x_next = "SNES9x Next (Nintendo SNES)" libretro_nestopia = "Nestopia (Nintendo NES)" libretro_pcsx_rearmed-neon = "PCSX-reARMed (PlayStation1) [NEON]" libretro_pcsx_rearmed = "PCSX-reARMed (PlayStation1)" libretro_nxengine = "NXEngine (Cave Story/Doukutsu Monogatari)" libretro_quicknes = "QuickNES (Nintendo NES)" libretro_tyrquake = "TyrQuake (Quake 1)" +libretro_instancingviewer = "InstancingViewer (Images)" +libretro_desmume = "Desmume (Nintendo DS)" +libretro_stella = "Stella (Atari 2600)" libretro_scenewalker = "SceneWalker (Objects)" libretro_modelviewer = "ModelViewer (Objects)" libretro_mame078 = "MAME 2003 [0.78] (Arcade)" diff --git a/android/phoenix/src/org/retroarch/browser/RetroArch.java b/android/phoenix/src/org/retroarch/browser/RetroArch.java index da51bd2af8..98d192615c 100644 --- a/android/phoenix/src/org/retroarch/browser/RetroArch.java +++ b/android/phoenix/src/org/retroarch/browser/RetroArch.java @@ -299,21 +299,10 @@ public class RetroArch extends Activity implements { AlertDialog.Builder alert = new AlertDialog.Builder(this) .setTitle("NVidia Shield detected") - .setMessage("Would you like to set up the ideal configuration options for your device?") + .setMessage("Would you like to set up the ideal configuration options for your device?\nNOTE: For optimal performance, turn off Google Account sync, GPS and Wifi in your Android settings menu.") .setPositiveButton("Yes", new DialogInterface.OnClickListener() { @Override public void onClick(DialogInterface dialog, int which) { - config.setBoolean("video_threaded", true); - config.setBoolean("input_autodetect_enable", true); - config.setBoolean("input_overlay_enable", false); - config.setDouble("video_refresh_rate", 59.6); - - String confPath = getDefaultConfigPath(); - try { - config.write(new File(confPath)); - } catch (IOException e) { - Log.e(TAG, "Failed to save config file to: " + confPath); - } } }) .setNegativeButton("No", null);