Merge branch 'master' of https://code.google.com/p/dolphin-emu into dx9-ssaa-fix

3 files changed, 42 insertions, 52 deletions

diff --git a/Source/Android/src/org/dolphinemu/dolphinemu/AboutFragment.java b/Source/Android/src/org/dolphinemu/dolphinemu/AboutFragment.java
index 5c47b79a3e..906736b039 100644
--- a/Source/Android/src/org/dolphinemu/dolphinemu/AboutFragment.java
+++ b/Source/Android/src/org/dolphinemu/dolphinemu/AboutFragment.java
@@ -37,10 +37,9 @@ public class AboutFragment extends Fragment {
 		mMainList = (ListView) rootView.findViewById(R.id.gamelist);
 
 		List<GameListItem> Input = new ArrayList<GameListItem>();
-		int a = 0;
+		Input.add(new GameListItem(m_activity, "Build Revision", NativeLibrary.GetVersionString(), "", true));
+		Input.add(new GameListItem(m_activity, "Supports OpenGL ES 3", PrefsFragment.SupportsGLES3() ? "Yes" : "No", "", true));
 
-		Input.add(a++, new GameListItem(m_activity, "Build Revision", NativeLibrary.GetVersionString(), "", true));
-		Input.add(a++, new GameListItem(m_activity, "Supports OpenGL ES 3", PrefsFragment.SupportsGLES3() ? "Yes" : "No", "", true));
 		adapter = new FolderBrowserAdapter(m_activity, R.layout.folderbrowser, Input);
 		mMainList.setAdapter(adapter);
 
diff --git a/Source/Android/src/org/dolphinemu/dolphinemu/InputConfigFragment.java b/Source/Android/src/org/dolphinemu/dolphinemu/InputConfigFragment.java
index 3a6e855c3b..91f550d2a2 100644
--- a/Source/Android/src/org/dolphinemu/dolphinemu/InputConfigFragment.java
+++ b/Source/Android/src/org/dolphinemu/dolphinemu/InputConfigFragment.java
@@ -47,29 +47,27 @@ public class InputConfigFragment extends Fragment
 	                         Bundle savedInstanceState)
 	{
 		List<InputConfigItem> Input = new ArrayList<InputConfigItem>();
-		int a = 0;
-
-		Input.add(a++, new InputConfigItem("Draw on-screen controls", "Android-ScreenControls", "True"));
-		Input.add(a++, new InputConfigItem("Button A", "Android-InputA"));
-		Input.add(a++, new InputConfigItem("Button B", "Android-InputB"));
-		Input.add(a++, new InputConfigItem("Button Start", "Android-InputStart"));
-		Input.add(a++, new InputConfigItem("Button X", "Android-InputX"));
-		Input.add(a++, new InputConfigItem("Button Y", "Android-InputY"));
-		Input.add(a++, new InputConfigItem("Button Z", "Android-InputZ"));
-		Input.add(a++, new InputConfigItem("D-Pad Up", "Android-DPadUp"));
-		Input.add(a++, new InputConfigItem("D-Pad Down", "Android-DPadDown"));
-		Input.add(a++, new InputConfigItem("D-Pad Left", "Android-DPadLeft"));
-		Input.add(a++, new InputConfigItem("D-Pad Right", "Android-DPadRight"));
-		Input.add(a++, new InputConfigItem("Main Stick Up", "Android-MainUp"));
-		Input.add(a++, new InputConfigItem("Main Stick Down", "Android-MainDown"));
-		Input.add(a++, new InputConfigItem("Main Stick Left", "Android-MainLeft"));
-		Input.add(a++, new InputConfigItem("Main Stick Right", "Android-MainRight"));
-		Input.add(a++, new InputConfigItem("C Stick Up", "Android-CStickUp"));
-		Input.add(a++, new InputConfigItem("C Stick Down", "Android-CStickDown"));
-		Input.add(a++, new InputConfigItem("C Stick Left", "Android-CStickLeft"));
-		Input.add(a++, new InputConfigItem("C Stick Right", "Android-CStickRight"));
-		Input.add(a++, new InputConfigItem("Trigger L", "Android-InputL"));
-		Input.add(a++, new InputConfigItem("Trigger R", "Android-InputR"));
+		Input.add(new InputConfigItem("Draw on-screen controls", "Android-ScreenControls", "True"));
+		Input.add(new InputConfigItem("Button A", "Android-InputA"));
+		Input.add(new InputConfigItem("Button B", "Android-InputB"));
+		Input.add(new InputConfigItem("Button Start", "Android-InputStart"));
+		Input.add(new InputConfigItem("Button X", "Android-InputX"));
+		Input.add(new InputConfigItem("Button Y", "Android-InputY"));
+		Input.add(new InputConfigItem("Button Z", "Android-InputZ"));
+		Input.add(new InputConfigItem("D-Pad Up", "Android-DPadUp"));
+		Input.add(new InputConfigItem("D-Pad Down", "Android-DPadDown"));
+		Input.add(new InputConfigItem("D-Pad Left", "Android-DPadLeft"));
+		Input.add(new InputConfigItem("D-Pad Right", "Android-DPadRight"));
+		Input.add(new InputConfigItem("Main Stick Up", "Android-MainUp"));
+		Input.add(new InputConfigItem("Main Stick Down", "Android-MainDown"));
+		Input.add(new InputConfigItem("Main Stick Left", "Android-MainLeft"));
+		Input.add(new InputConfigItem("Main Stick Right", "Android-MainRight"));
+		Input.add(new InputConfigItem("C Stick Up", "Android-CStickUp"));
+		Input.add(new InputConfigItem("C Stick Down", "Android-CStickDown"));
+		Input.add(new InputConfigItem("C Stick Left", "Android-CStickLeft"));
+		Input.add(new InputConfigItem("C Stick Right", "Android-CStickRight"));
+		Input.add(new InputConfigItem("Trigger L", "Android-InputL"));
+		Input.add(new InputConfigItem("Trigger R", "Android-InputR"));
 
 		adapter = new InputConfigAdapter(m_activity, R.layout.folderbrowser, Input);
 		View rootView = inflater.inflate(R.layout.gamelist_listview, container, false);
diff --git a/Source/Android/src/org/dolphinemu/dolphinemu/PrefsFragment.java b/Source/Android/src/org/dolphinemu/dolphinemu/PrefsFragment.java
index daf9aeb1c6..e16b2503c3 100644
--- a/Source/Android/src/org/dolphinemu/dolphinemu/PrefsFragment.java
+++ b/Source/Android/src/org/dolphinemu/dolphinemu/PrefsFragment.java
@@ -1,5 +1,7 @@
 package org.dolphinemu.dolphinemu;
 
+import java.util.HashMap;
+
 import android.app.Activity;
 import android.os.Build;
 import android.os.Bundle;
@@ -138,36 +140,28 @@ public class PrefsFragment extends PreferenceFragment {
         addPreferencesFromResource(R.layout.prefs);
 
         final ListPreference etp = new ListPreference(m_activity);
-        CharSequence[] _entries;
-        CharSequence[] _entryvalues;
+        final HashMap<CharSequence, CharSequence> entries = new HashMap<CharSequence, CharSequence>();
 
         if (Build.CPU_ABI.contains("x86"))
         {
-	        _entries = new CharSequence[] {
-		        "Interpreter",
-		        "JIT64 Recompiler",
-		        "JITIL Recompiler",
-	        };
-	        _entryvalues = new CharSequence[] {"0", "1", "2"};
+	        entries.put("Interpreter", "0");
+	        entries.put("JIT64 Recompiler", "1");
+	        entries.put("JITIL Recompiler", "2");
         }
         else if (Build.CPU_ABI.contains("arm"))
         {
-	        _entries = new CharSequence[] {
-			        "Interpreter",
-			        "JIT ARM Recompiler",
-	        };
-	        _entryvalues = new CharSequence[] {"0", "3"};
+	        entries.put("Interpreter", "0");
+	        entries.put("JIT ARM Recompiler", "3");
         }
         else
         {
-	        _entries = new CharSequence[] {
-			        "Interpreter",
-	        };
-	        _entryvalues = new CharSequence[] {"0"};
+            entries.put("Interpreter", "0");
         }
-
-        etp.setEntries(_entries);
-        etp.setEntryValues(_entryvalues);
+        
+        // Convert the key/value sections to arrays respectively so the list can be set.
+        // If Java had proper generics it wouldn't look this disgusting.
+        etp.setEntries(entries.keySet().toArray(new CharSequence[entries.size()]));
+        etp.setEntryValues(entries.values().toArray(new CharSequence[entries.size()]));
         etp.setKey("cpupref");
         etp.setTitle("CPU Core");
         etp.setSummary("Emulation core to use");
@@ -185,17 +179,16 @@ public class PrefsFragment extends PreferenceFragment {
 
 	        final ListPreference videobackend = new ListPreference(m_activity);
 
-	        _entries = new CharSequence[] {
-			        "Software Renderer",
-	        };
-	        _entryvalues = new CharSequence[] {"Software Renderer"};
+	        // Add available graphics renderers to the hashmap to add to the list.
+	        entries.clear();
+	        entries.put("Software Renderer", "Software Renderer"); // TODO: I think this is a bug? The value shouldn't be the same as the key?
 
 	        videobackend.setKey("gpupref");
 	        videobackend.setTitle("Video Backend");
 	        videobackend.setSummary("Video backend to use");
 
-	        videobackend.setEntries(_entries);
-	        videobackend.setEntryValues(_entryvalues);
+	        videobackend.setEntries(entries.keySet().toArray(new CharSequence[entries.size()]));
+	        videobackend.setEntryValues(entries.values().toArray(new CharSequence[entries.size()]));
 
 	        mCategory.addPreference(videobackend);
         }