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

Add a notice about the OUYA R3 being the onscreen menu

This commit is contained in:
TwistedUmbrella 2014-02-23 18:37:04 -05:00
parent 985297183a
commit a2b8aba035
2 changed files with 18 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -67,6 +67,7 @@
<string name="bios_menu">Press the %1$s button for a menu</string>
<string name="back_button">back</string>
<string name="menu_button">menu</string>
<string name="right_button">R3</string>
<string name="moga_pro_connect">MOGA Pro Connected!</string>
<string name="moga_connect">MOGA Connected!</string>

17
shell/android/src/com/reicast/emulator/emu/GL2JNIActivity.java
View File

@ -211,6 +211,23 @@ public class GL2JNIActivity extends Activity {
// Create the actual GLES view
mView = new GL2JNIView(getApplication(), fileName, false, prefs.getInt("depth_render", 24), 0, false);
setContentView(mView);
<<<<<<< HEAD
=======
String menu_spec;
if (isXperiaPlay) {
menu_spec = getApplicationContext().getString(R.string.menu_button);
} else if (isOuyaOrTV) {
menu_spec = getApplicationContext().getString(R.string.right_button);
} else {
menu_spec = getApplicationContext().getString(R.string.back_button);
}
Toast.makeText(
getApplicationContext(),
getApplicationContext()
.getString(R.string.bios_menu, menu_spec),
Toast.LENGTH_SHORT).show();
>>>>>>> Add a notice about the OUYA R3 being the onscreen menu
//setup mic
boolean micPluggedIn = prefs.getBoolean("mic_plugged_in", false);