mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-02-22 12:40:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

[Android] Remove the need for RefreshRateSetOS. This can be done with a preference listener within VideoPreferenceFragment.

Browse Source
This commit is contained in:
Lioncash 2013-10-15 10:54:40 -04:00
parent b1a48dea51
commit e622fc9f4d
5 changed files with 31 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
android/phoenix/AndroidManifest.xml
View File

@ -18,7 +18,6 @@
<activity android:name=".browser.CoreSelection"/> <activity android:name=".browser.CoreSelection"/>
<activity android:name=".browser.HistorySelection"/> <activity android:name=".browser.HistorySelection"/>
<activity android:name=".browser.DisplayRefreshRateTest"/> <activity android:name=".browser.DisplayRefreshRateTest"/>
<activity android:name=".browser.RefreshRateSetOS"/>
<activity android:name=".browser.MainMenuActivity" android:exported="true"> <activity android:name=".browser.MainMenuActivity" android:exported="true">
<intent-filter> <intent-filter>
<action android:name="android.intent.action.MAIN" /> <action android:name="android.intent.action.MAIN" />

7
android/phoenix/res/xml/video_preferences.xml
View File

@ -44,12 +44,9 @@
android:targetPackage="org.retroarch" /> android:targetPackage="org.retroarch" />
</Preference> </Preference>
<Preference <Preference
android:key="set_os_reported_ref_rate_pref"
android:summary="@string/set_os_reported_refresh_rate_desc" android:summary="@string/set_os_reported_refresh_rate_desc"
android:title="@string/set_os_reported_refresh_rate" > android:title="@string/set_os_reported_refresh_rate" />
<intent
android:targetClass="org.retroarch.browser.RefreshRateSetOS"
android:targetPackage="org.retroarch" />
</Preference>
</PreferenceCategory> </PreferenceCategory>
<PreferenceCategory android:title="@string/shaders" > <PreferenceCategory android:title="@string/shaders" >
<CheckBoxPreference <CheckBoxPreference

30
android/phoenix/src/org/retroarch/browser/RefreshRateSetOS.java
View File

@ -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();
}
}

2
android/phoenix/src/org/retroarch/browser/preferences/fragments/InputPreferenceFragment.java
View File

@ -26,7 +26,7 @@ public final class InputPreferenceFragment extends PreferenceListFragment
// Set Input Method preference // Set Input Method preference
final Preference setImePref = findPreference("set_ime_pref"); final Preference setImePref = findPreference("set_ime_pref");
setImePref.setOnPreferenceClickListener(new Preference.OnPreferenceClickListener() setImePref.setOnPreferenceClickListener(new OnPreferenceClickListener()
{ {
@Override @Override
public boolean onPreferenceClick(Preference preference) public boolean onPreferenceClick(Preference preference)

28
android/phoenix/src/org/retroarch/browser/preferences/fragments/VideoPreferenceFragment.java
View File

@ -3,7 +3,14 @@ package org.retroarch.browser.preferences.fragments;
import org.retroarch.R; import org.retroarch.R;
import org.retroarch.browser.preferences.fragments.util.PreferenceListFragment; import org.retroarch.browser.preferences.fragments.util.PreferenceListFragment;
import android.content.SharedPreferences;
import android.os.Bundle; 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. * A {@link PreferenceListFragment} responsible for handling the video preferences.
@ -17,5 +24,26 @@ public final class VideoPreferenceFragment extends PreferenceListFragment
// Add preferences from the resources // Add preferences from the resources
addPreferencesFromResource(R.xml.video_preferences); 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;
}
});
} }
} }