ShuriZma
/
RetroArch
mirror of https://github.com/libretro/RetroArch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #343 from lioncash/master 

[Android] Eliminate the need for several activities.
This commit is contained in:
Squarepusher 2013-10-15 09:04:55 -07:00
parent 3c3e90b0df d3c96cfaed
commit 409c9614ba
11 changed files with 77 additions and 2920 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
android/phoenix/AndroidManifest.xml
View File

@ -18,16 +18,13 @@
<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" />
<category android:name="android.intent.category.LAUNCHER" />
<category android:name="tv.ouya.intent.category.GAME" />
</intent-filter>
</activity>
<activity android:name=".browser.ReportIME"/>
<activity android:name=".browser.IMEActivity"/>
</activity>
<activity android:name=".browser.HelpActivity"/>
<activity android:name=".browser.FileWrapper"/>
<activity android:name=".browser.RetroTVMode"/>

6
android/phoenix/libs/appcompat/gen/android/support/v7/appcompat/BuildConfig.java
View File

@ -1,6 +0,0 @@
/** Automatically generated file. DO NOT MODIFY */
package android.support.v7.appcompat;
public final class BuildConfig {
public final static boolean DEBUG = true;
}

2812
android/phoenix/libs/appcompat/gen/android/support/v7/appcompat/R.java
View File

File diff suppressed because it is too large Load Diff

1
android/phoenix/res/values/strings.xml
View File

@ -123,6 +123,7 @@
<string name="r2_button">R2 Button</string>
<string name="r3_button">R3 Button</string>
<string name="diagnostics">Diagnostics</string>
<string name="current_ime">Current IME</string>
<string name="report_ime">Report IME</string>
<string name="report_ime_desc">Reports the current IME (Input Method Editor) name.</string>

17
android/phoenix/res/xml/input_preferences.xml
View File

@ -12,12 +12,9 @@
<PreferenceCategory android:title="@string/ime" >
<Preference
android:key="set_ime_pref"
android:summary="@string/ime_method_desc"
android:title="@string/ime_method" >
<intent
android:targetClass="org.retroarch.browser.IMEActivity"
android:targetPackage="org.retroarch" />
</Preference>
android:title="@string/ime_method" />
</PreferenceCategory>
<PreferenceCategory android:title="@string/config_autodetect" >
@ -294,11 +291,9 @@
</PreferenceScreen>
</PreferenceCategory>
<PreferenceCategory android:title="@string/diagnostics" >
<Preference android:title="@string/report_ime"
android:summary="@string/report_ime_desc">
<intent
android:targetClass="org.retroarch.browser.ReportIME"
android:targetPackage="org.retroarch" />
</Preference>
<Preference
android:key="report_ime_pref"
android:title="@string/report_ime"
android:summary="@string/report_ime_desc"/>
</PreferenceCategory>
</PreferenceScreen>

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

@ -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

16
android/phoenix/src/org/retroarch/browser/IMEActivity.java
View File

@ -1,16 +0,0 @@
package org.retroarch.browser;
import android.app.Activity;
import android.content.Context;
import android.os.Bundle;
import android.view.inputmethod.InputMethodManager;
public final class IMEActivity extends Activity {
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
InputMethodManager imm = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE);
imm.showInputMethodPicker();
finish();
}
}

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

36
android/phoenix/src/org/retroarch/browser/ReportIME.java
View File

@ -1,36 +0,0 @@
package org.retroarch.browser;
import org.retroarch.R;
import android.app.Activity;
import android.app.AlertDialog;
import android.content.DialogInterface;
import android.os.Bundle;
import android.provider.Settings;
public final class ReportIME extends Activity {
@Override
public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
String current_ime = Settings.Secure.getString(getContentResolver(),
Settings.Secure.DEFAULT_INPUT_METHOD);
AlertDialog.Builder dialog = new AlertDialog.Builder(this)
.setMessage(current_ime)
.setNeutralButton(R.string.close,
new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int which) {
finish();
}
}).setCancelable(true)
.setOnCancelListener(new DialogInterface.OnCancelListener() {
@Override
public void onCancel(DialogInterface dialog) {
finish();
}
});
dialog.show();
}
}

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

@ -3,7 +3,13 @@ package org.retroarch.browser.preferences.fragments;
import org.retroarch.R;
import org.retroarch.browser.preferences.fragments.util.PreferenceListFragment;
import android.app.AlertDialog;
import android.content.Context;
import android.os.Bundle;
import android.preference.Preference;
import android.preference.Preference.OnPreferenceClickListener;
import android.provider.Settings;
import android.view.inputmethod.InputMethodManager;
/**
* A {@link PreferenceListFragment} responsible for handling the input preferences.
@ -17,5 +23,38 @@ public final class InputPreferenceFragment extends PreferenceListFragment
// Add input preferences from the XML.
addPreferencesFromResource(R.xml.input_preferences);
// Set Input Method preference
final Preference setImePref = findPreference("set_ime_pref");
setImePref.setOnPreferenceClickListener(new OnPreferenceClickListener()
{
@Override
public boolean onPreferenceClick(Preference preference)
{
// Show an IME picker so the user can change their set IME.
InputMethodManager imm = (InputMethodManager) getActivity().getSystemService(Context.INPUT_METHOD_SERVICE);
imm.showInputMethodPicker();
return true;
}
});
// Report IME preference
final Preference reportImePref = findPreference("report_ime_pref");
reportImePref.setOnPreferenceClickListener(new OnPreferenceClickListener()
{
@Override
public boolean onPreferenceClick(Preference preference)
{
final String currentIme = Settings.Secure.getString(getActivity().getContentResolver(),
Settings.Secure.DEFAULT_INPUT_METHOD);
AlertDialog.Builder reportImeDialog = new AlertDialog.Builder(getActivity());
reportImeDialog.setTitle(R.string.current_ime);
reportImeDialog.setMessage(currentIme);
reportImeDialog.setNegativeButton(R.string.close, null);
reportImeDialog.show();
return true;
}
});
}
}

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.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;
}
});
}
}