From e622fc9f4daf32cf2dd200a2bc5476321be84bd1 Mon Sep 17 00:00:00 2001
From: Lioncash <mathew1800@gmail.com>
Date: Tue, 15 Oct 2013 10:54:40 -0400
Subject: [PATCH] [Android] Remove the need for RefreshRateSetOS. This can be
 done with a preference listener within VideoPreferenceFragment.

---
 android/phoenix/AndroidManifest.xml           |  1 -
 android/phoenix/res/xml/video_preferences.xml |  7 ++---
 .../retroarch/browser/RefreshRateSetOS.java   | 30 -------------------
 .../fragments/InputPreferenceFragment.java    |  2 +-
 .../fragments/VideoPreferenceFragment.java    | 28 +++++++++++++++++
 5 files changed, 31 insertions(+), 37 deletions(-)
 delete mode 100644 android/phoenix/src/org/retroarch/browser/RefreshRateSetOS.java

diff --git a/android/phoenix/AndroidManifest.xml b/android/phoenix/AndroidManifest.xml
index db3f2c1c5a..231c715d33 100644
--- a/android/phoenix/AndroidManifest.xml
+++ b/android/phoenix/AndroidManifest.xml
@@ -18,7 +18,6 @@
         <activity android:name=".browser.CoreSelection"/>
         <activity android:name=".browser.HistorySelection"/>
         <activity android:name=".browser.DisplayRefreshRateTest"/>
-        <activity android:name=".browser.RefreshRateSetOS"/>
         <activity android:name=".browser.MainMenuActivity" android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
diff --git a/android/phoenix/res/xml/video_preferences.xml b/android/phoenix/res/xml/video_preferences.xml
index f85855c99a..144bcbd47a 100644
--- a/android/phoenix/res/xml/video_preferences.xml
+++ b/android/phoenix/res/xml/video_preferences.xml
@@ -44,12 +44,9 @@
                     android:targetPackage="org.retroarch" />
             </Preference>
             <Preference
+                android:key="set_os_reported_ref_rate_pref"
                 android:summary="@string/set_os_reported_refresh_rate_desc"
-                android:title="@string/set_os_reported_refresh_rate" >
-                <intent
-                    android:targetClass="org.retroarch.browser.RefreshRateSetOS"
-                    android:targetPackage="org.retroarch" />
-            </Preference>
+                android:title="@string/set_os_reported_refresh_rate" />
         </PreferenceCategory>
         <PreferenceCategory android:title="@string/shaders" >
             <CheckBoxPreference
diff --git a/android/phoenix/src/org/retroarch/browser/RefreshRateSetOS.java b/android/phoenix/src/org/retroarch/browser/RefreshRateSetOS.java
deleted file mode 100644
index ba55df5576..0000000000
--- a/android/phoenix/src/org/retroarch/browser/RefreshRateSetOS.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package org.retroarch.browser;
-
-import org.retroarch.R;
-import org.retroarch.browser.preferences.util.UserPreferences;
-
-import android.app.Activity;
-import android.content.SharedPreferences;
-import android.os.Bundle;
-import android.view.Display;
-import android.view.WindowManager;
-import android.widget.Toast;
-
-public final class RefreshRateSetOS extends Activity {
-
-	@Override
-	protected void onCreate(Bundle savedInstanceState) {
-		super.onCreate(savedInstanceState);
-		
-		final WindowManager wm = getWindowManager();
-		final Display display = wm.getDefaultDisplay();
-		double rate = display.getRefreshRate();
-		SharedPreferences prefs = UserPreferences.getPreferences(this);
-		SharedPreferences.Editor edit = prefs.edit();
-		edit.putString("video_refresh_rate", Double.toString(rate));
-		edit.commit();
-		
-		Toast.makeText(this, String.format(getString(R.string.using_os_reported_refresh_rate), rate), Toast.LENGTH_LONG).show();
-		finish();
-	}
-}
diff --git a/android/phoenix/src/org/retroarch/browser/preferences/fragments/InputPreferenceFragment.java b/android/phoenix/src/org/retroarch/browser/preferences/fragments/InputPreferenceFragment.java
index c30e4cdffd..642e5fdd70 100644
--- a/android/phoenix/src/org/retroarch/browser/preferences/fragments/InputPreferenceFragment.java
+++ b/android/phoenix/src/org/retroarch/browser/preferences/fragments/InputPreferenceFragment.java
@@ -26,7 +26,7 @@ public final class InputPreferenceFragment extends PreferenceListFragment
 
 		// Set Input Method preference
 		final Preference setImePref = findPreference("set_ime_pref");
-		setImePref.setOnPreferenceClickListener(new Preference.OnPreferenceClickListener()
+		setImePref.setOnPreferenceClickListener(new OnPreferenceClickListener()
 		{
 			@Override
 			public boolean onPreferenceClick(Preference preference)
diff --git a/android/phoenix/src/org/retroarch/browser/preferences/fragments/VideoPreferenceFragment.java b/android/phoenix/src/org/retroarch/browser/preferences/fragments/VideoPreferenceFragment.java
index 34999a3703..46da49009f 100644
--- a/android/phoenix/src/org/retroarch/browser/preferences/fragments/VideoPreferenceFragment.java
+++ b/android/phoenix/src/org/retroarch/browser/preferences/fragments/VideoPreferenceFragment.java
@@ -3,7 +3,14 @@ package org.retroarch.browser.preferences.fragments;
 import org.retroarch.R;
 import org.retroarch.browser.preferences.fragments.util.PreferenceListFragment;
 
+import android.content.SharedPreferences;
 import android.os.Bundle;
+import android.preference.Preference;
+import android.preference.PreferenceManager;
+import android.preference.Preference.OnPreferenceClickListener;
+import android.view.Display;
+import android.view.WindowManager;
+import android.widget.Toast;
 
 /**
  * A {@link PreferenceListFragment} responsible for handling the video preferences.
@@ -17,5 +24,26 @@ public final class VideoPreferenceFragment extends PreferenceListFragment
 
 		// Add preferences from the resources
 		addPreferencesFromResource(R.xml.video_preferences);
+
+		// Set OS-reported refresh rate preference.
+		final Preference osReportedRatePref = findPreference("set_os_reported_ref_rate_pref");
+		osReportedRatePref.setOnPreferenceClickListener(new OnPreferenceClickListener()
+		{
+			@Override
+			public boolean onPreferenceClick(Preference preference)
+			{
+				final WindowManager wm = getActivity().getWindowManager();
+				final Display display = wm.getDefaultDisplay();
+				final double rate = display.getRefreshRate();
+
+				final SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(getActivity());
+				final SharedPreferences.Editor edit = prefs.edit();
+				edit.putString("video_refresh_rate", Double.toString(rate));
+				edit.commit();
+
+				Toast.makeText(getActivity(), String.format(getString(R.string.using_os_reported_refresh_rate), rate), Toast.LENGTH_LONG).show();
+				return true;
+			}
+		});
 	}
 }