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

android: fix cable,region,broadcast settings

This commit is contained in:
Flyinghead 2018-10-01 12:14:09 +02:00
parent 19c0e3aea5
commit f4d14ec4aa
2 changed files with 20 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
shell/android-studio/reicast/src/main/java/com/reicast/emulator/config/OptionsFragment.java
View File

@ -297,14 +297,16 @@ public class OptionsFragment extends Fragment {
cableAdapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item);
cable_spnr.setAdapter(cableAdapter);
cable_spnr.setSelection(mPrefs.getInt(
Emulator.pref_cable, Emulator.cable) - 1, true);
int selectedItem = mPrefs.getInt(Emulator.pref_cable, Emulator.cable);
if (selectedItem > 0)
selectedItem--;
cable_spnr.setSelection(selectedItem, true);
cable_spnr.setOnItemSelectedListener(new OnItemSelectedListener() {
public void onItemSelected(AdapterView<?> parent, View view,
int pos, long id) {
mPrefs.edit().putInt(Emulator.pref_cable, pos + 1).apply();
mPrefs.edit().putInt(Emulator.pref_cable, pos > 0 ? pos + 1 : pos).apply();
}
public void onNothingSelected(AdapterView<?> arg0) {
@ -337,21 +339,12 @@ public class OptionsFragment extends Fragment {
getActivity(), R.layout.spinner_selected, broadcasts);
broadcastAdapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item);
broadcast_spnr.setAdapter(broadcastAdapter);
broadcast_spnr.setSelection(mPrefs.getInt(Emulator.pref_broadcast, Emulator.broadcast), true);
int select = 0;
String cast = String.valueOf(mPrefs.getInt(Emulator.pref_broadcast, Emulator.broadcast));
for (int i = 0; i < broadcasts.length; i++) {
if (broadcasts[i].startsWith(cast + " - "))
select = i;
}
broadcast_spnr.setSelection(select, true);
broadcast_spnr.setOnItemSelectedListener(new OnItemSelectedListener() {
public void onItemSelected(AdapterView<?> parent, View view, int pos, long id) {
String item = parent.getItemAtPosition(pos).toString();
String selection = item.substring(0, item.indexOf(" - "));
mPrefs.edit().putInt(Emulator.pref_broadcast, Integer.parseInt(selection)).apply();
mPrefs.edit().putInt(Emulator.pref_broadcast, pos).apply();
}

26
shell/android-studio/reicast/src/main/res/values/donottranslate.xml
View File

@ -15,9 +15,9 @@
</string-array>
<string-array name="cable">
<item>HDMI</item>
<item>Component</item>
<item>VGA</item>
<item>Component</item>
<item>TV</item>
</string-array>
<string-array name="themes">
@ -33,26 +33,26 @@
</string-array>
<string-array name="region">
<item>NTSC-J</item>
<item>NTSC-U/PAL-M/PAL-N</item>
<item>PAL-E</item>
<item>Japan</item>
<item>USA</item>
<item>Europe</item>
<item>reicast</item>
</string-array>
<string-array name="bios">
<item>NTSC-J</item>
<item>NTSC-U/PAL-M/PAL-N</item>
<item>PAL-E</item>
<item>Japan</item>
<item>USA</item>
<item>Europe</item>
<item>reicast</item>
<item>Katana</item>
</string-array>
<string-array name="broadcast">
<item>0 - NTSC-J</item>
<item>4 - NTSC-U</item>
<item>6 - PAL-M</item>
<item>7 - PAL-N</item>
<item>9 - PAL-E</item>
<item>NTSC</item>
<item>PAL</item>
<item>PAL-M</item>
<item>PAL-N</item>
<item>reicast</item>
</string-array>
<string-array name="bioscode">