Merge branch 'master' of https://code.google.com/p/dolphin-emu into android-core-control

9 files changed, 69 insertions, 15 deletions

diff --git a/Source/Android/src/org/dolphinemu/dolphinemu/AboutFragment.java b/Source/Android/src/org/dolphinemu/dolphinemu/AboutFragment.java
index 3a41b0872e..a94a22a964 100644
--- a/Source/Android/src/org/dolphinemu/dolphinemu/AboutFragment.java
+++ b/Source/Android/src/org/dolphinemu/dolphinemu/AboutFragment.java
@@ -28,14 +28,12 @@ import org.dolphinemu.dolphinemu.settings.VideoSettingsFragment;
 public final class AboutFragment extends Fragment
 {
 	private static Activity m_activity;
-	private ListView mMainList;
-	private AboutFragmentAdapter adapter;
 
 	@Override
 	public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState)
 	{
 		View rootView = inflater.inflate(R.layout.gamelist_listview, container, false);
-		mMainList = (ListView) rootView.findViewById(R.id.gamelist);
+		ListView mMainList = (ListView) rootView.findViewById(R.id.gamelist);
 
 		String yes = getString(R.string.yes);
 		String no = getString(R.string.no);
@@ -44,7 +42,7 @@ public final class AboutFragment extends Fragment
 		Input.add(new AboutFragmentItem(getString(R.string.build_revision), NativeLibrary.GetVersionString()));
 		Input.add(new AboutFragmentItem(getString(R.string.supports_gles3), VideoSettingsFragment.SupportsGLES3() ? yes : no));
 
-		adapter = new AboutFragmentAdapter(m_activity, R.layout.about_layout, Input);
+		AboutFragmentAdapter adapter = new AboutFragmentAdapter(m_activity, R.layout.about_layout, Input);
 		mMainList.setAdapter(adapter);
 
 		return mMainList;
diff --git a/Source/Android/src/org/dolphinemu/dolphinemu/DolphinEmulator.java b/Source/Android/src/org/dolphinemu/dolphinemu/DolphinEmulator.java
index c140f28d7f..6703c5710c 100644
--- a/Source/Android/src/org/dolphinemu/dolphinemu/DolphinEmulator.java
+++ b/Source/Android/src/org/dolphinemu/dolphinemu/DolphinEmulator.java
@@ -18,10 +18,8 @@ import java.io.*;
 
 /**
  * The main activity of this emulator.
- *
- * @param <MainActivity> Main activity.
  */
-public final class DolphinEmulator<MainActivity> extends Activity 
+public final class DolphinEmulator extends Activity 
 {
 	private void CopyAsset(String asset, String output)
 	{
diff --git a/Source/Android/src/org/dolphinemu/dolphinemu/EmulationActivity.java b/Source/Android/src/org/dolphinemu/dolphinemu/EmulationActivity.java
index aab01ad1ce..f982f9871c 100644
--- a/Source/Android/src/org/dolphinemu/dolphinemu/EmulationActivity.java
+++ b/Source/Android/src/org/dolphinemu/dolphinemu/EmulationActivity.java
@@ -14,7 +14,6 @@ import android.graphics.Color;
 import android.graphics.drawable.ColorDrawable;
 import android.os.Bundle;
 import android.util.DisplayMetrics;
-import android.util.Log;
 import android.view.InputDevice;
 import android.view.KeyEvent;
 import android.view.Menu;
diff --git a/Source/Android/src/org/dolphinemu/dolphinemu/folderbrowser/FolderBrowser.java b/Source/Android/src/org/dolphinemu/dolphinemu/folderbrowser/FolderBrowser.java
index 306802a6de..890c43f347 100644
--- a/Source/Android/src/org/dolphinemu/dolphinemu/folderbrowser/FolderBrowser.java
+++ b/Source/Android/src/org/dolphinemu/dolphinemu/folderbrowser/FolderBrowser.java
@@ -112,7 +112,7 @@ public final class FolderBrowser extends Fragment
 		return mDrawerList;
 	}
 
-	private AdapterView.OnItemClickListener mMenuItemClickListener = new AdapterView.OnItemClickListener()
+	private final AdapterView.OnItemClickListener mMenuItemClickListener = new AdapterView.OnItemClickListener()
 	{
 		public void onItemClick(AdapterView<?> parent, View view, int position, long id)
 		{
@@ -143,7 +143,6 @@ public final class FolderBrowser extends Fragment
 	{
 		String Directories = NativeLibrary.GetConfig("Dolphin.ini", "General", "GCMPathes", "0");
 		int intDirectories = Integer.parseInt(Directories);
-		Directories = Integer.toString(intDirectories + 1);
 
 		// Check to see if a path set in the Dolphin config
 		// matches the one the user is trying to add. If it's
diff --git a/Source/Android/src/org/dolphinemu/dolphinemu/gamelist/GameListActivity.java b/Source/Android/src/org/dolphinemu/dolphinemu/gamelist/GameListActivity.java
index 86deafdeb6..5eaa24f9de 100644
--- a/Source/Android/src/org/dolphinemu/dolphinemu/gamelist/GameListActivity.java
+++ b/Source/Android/src/org/dolphinemu/dolphinemu/gamelist/GameListActivity.java
@@ -178,7 +178,7 @@ public final class GameListActivity extends Activity
 		}
 	}
 
-	private AdapterView.OnItemClickListener mMenuItemClickListener = new AdapterView.OnItemClickListener()
+	private final AdapterView.OnItemClickListener mMenuItemClickListener = new AdapterView.OnItemClickListener()
 	{
 		public void onItemClick(AdapterView<?> parent, View view, int position, long id)
 		{
diff --git a/Source/Android/src/org/dolphinemu/dolphinemu/gamelist/GameListFragment.java b/Source/Android/src/org/dolphinemu/dolphinemu/gamelist/GameListFragment.java
index e0aefa153a..d96a3f8f99 100644
--- a/Source/Android/src/org/dolphinemu/dolphinemu/gamelist/GameListFragment.java
+++ b/Source/Android/src/org/dolphinemu/dolphinemu/gamelist/GameListFragment.java
@@ -120,7 +120,7 @@ public final class GameListFragment extends Fragment
 		return mMainList;
 	}
 
-	private AdapterView.OnItemClickListener mGameItemClickListener = new AdapterView.OnItemClickListener()
+	private final AdapterView.OnItemClickListener mGameItemClickListener = new AdapterView.OnItemClickListener()
 	{
 		public void onItemClick(AdapterView<?> parent, View view, int position, long id)
 		{
diff --git a/Source/Android/src/org/dolphinemu/dolphinemu/settings/InputConfigFragment.java b/Source/Android/src/org/dolphinemu/dolphinemu/settings/InputConfigFragment.java
index 132db39ce0..985fb6d45e 100644
--- a/Source/Android/src/org/dolphinemu/dolphinemu/settings/InputConfigFragment.java
+++ b/Source/Android/src/org/dolphinemu/dolphinemu/settings/InputConfigFragment.java
@@ -30,11 +30,10 @@ import org.dolphinemu.dolphinemu.R;
  * within the input control mapping config.
  */
 public final class InputConfigFragment extends PreferenceFragment
-		//implements PrefsActivity.OnGameConfigListener
 {
 	private Activity m_activity;
 	private boolean firstEvent = true;
-	private static ArrayList<Float> m_values = new ArrayList<Float>();
+	private static final ArrayList<Float> m_values = new ArrayList<Float>();
 
 	/**
 	 * Gets the descriptor for the given {@link InputDevice}.
diff --git a/Source/Android/src/org/dolphinemu/dolphinemu/settings/UserPreferences.java b/Source/Android/src/org/dolphinemu/dolphinemu/settings/UserPreferences.java
index 7f4840b9a2..08d6ee2021 100644
--- a/Source/Android/src/org/dolphinemu/dolphinemu/settings/UserPreferences.java
+++ b/Source/Android/src/org/dolphinemu/dolphinemu/settings/UserPreferences.java
@@ -37,7 +37,8 @@ public final class UserPreferences
 		editor.putString("cpuCorePref",   getConfig("Dolphin.ini", "Core", "CPUCore", "3"));
 		editor.putBoolean("dualCorePref", getConfig("Dolphin.ini", "Core", "CPUThread", "False").equals("True"));
 
-		editor.putString("gpuPref",              getConfig("Dolphin.ini", "Core", "GFXBackend ", "Software Renderer"));
+		editor.putString("gpuPref",               getConfig("Dolphin.ini", "Core", "GFXBackend ", "Software Renderer"));
+		editor.putBoolean("showFPS",              getConfig("gfx_opengl.ini", "Settings", "ShowFPS", "False").equals("True"));
 		editor.putBoolean("drawOnscreenControls", getConfig("Dolphin.ini", "Android", "ScreenControls", "True").equals("True"));
 
 		editor.putString("internalResolution",     getConfig("gfx_opengl.ini", "Settings", "EFBScale", "2") );
@@ -120,6 +121,9 @@ public final class UserPreferences
 		// Current video backend being used. Falls back to software rendering upon error.
 		String currentVideoBackend = prefs.getString("gpuPref", "Software Rendering");
 
+		// Whether or not FPS will be displayed on-screen.
+		boolean showingFPS = prefs.getBoolean("showFPS", false);
+
 		// Whether or not to draw on-screen controls.
 		boolean drawingOnscreenControls = prefs.getBoolean("drawOnscreenControls", true);
 
@@ -172,6 +176,7 @@ public final class UserPreferences
 
 		// General Video Settings
 		NativeLibrary.SetConfig("Dolphin.ini", "Core", "GFXBackend", currentVideoBackend);
+		NativeLibrary.SetConfig("gfx_opengl.ini", "Settings", "ShowFPS", showingFPS ? "True" : "False");
 		NativeLibrary.SetConfig("Dolphin.ini", "Android", "ScreenControls", drawingOnscreenControls ? "True" : "False");
 
 		// Video Hack Settings
diff --git a/Source/Android/src/org/dolphinemu/dolphinemu/settings/VideoSettingsFragment.java b/Source/Android/src/org/dolphinemu/dolphinemu/settings/VideoSettingsFragment.java
index b8e82f4dd0..fdaec5df01 100644
--- a/Source/Android/src/org/dolphinemu/dolphinemu/settings/VideoSettingsFragment.java
+++ b/Source/Android/src/org/dolphinemu/dolphinemu/settings/VideoSettingsFragment.java
@@ -16,9 +16,13 @@ import javax.microedition.khronos.opengles.GL10;
 import org.dolphinemu.dolphinemu.R;
 
 import android.app.Activity;
+import android.content.SharedPreferences;
+import android.content.SharedPreferences.OnSharedPreferenceChangeListener;
 import android.os.Bundle;
 import android.preference.ListPreference;
 import android.preference.PreferenceFragment;
+import android.preference.PreferenceManager;
+import android.preference.PreferenceScreen;
 
 /**
  * Responsible for handling the loading of the video preferences.
@@ -195,6 +199,58 @@ public final class VideoSettingsFragment extends PreferenceFragment
 			videoBackends.setEntries(R.array.videoBackendEntriesNoGLES3);
 			videoBackends.setEntryValues(R.array.videoBackendValuesNoGLES3);
 		}
+		
+		//
+		// Disable all options if Software Rendering is used.
+		//
+		// Note that the numeric value in 'getPreference()'
+		// 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 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);
+		}
+
+		// Also set a listener, so that if someone changes the video backend, it will disable
+		// the video settings, upon the user choosing "Software Rendering".
+		sPrefs.registerOnSharedPreferenceChangeListener(new OnSharedPreferenceChangeListener()
+		{
+			@Override
+			public void onSharedPreferenceChanged(SharedPreferences preference, String key)
+			{
+				if (key.equals("gpuPref"))
+				{
+					if (preference.getString(key, "Software Renderer").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 (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);
+					}
+				}
+			}
+		});
 	}
 
 	@Override