Apple-2-Tools/apple2ix
1
0
Fork 0
mirror of https://github.com/mauiaaron/apple2.git synced 2024-06-26 00:29:27 +00:00
Code Issues Projects Releases Wiki Activity

Resetting preferences will also quit to re-trigger any migration code

Browse Source
This commit is contained in:
Aaron Culliney 2015-12-12 13:20:47 -08:00
parent a761c11382
commit b1b55006be
4 changed files with 21 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
Android/app/src/main/java/org/deadc0de/apple2ix/Apple2Activity.java
View File

@ -595,25 +595,29 @@ public class Apple2Activity extends Activity {
}).setNeutralButton(R.string.quit, new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int which) {
nativeOnQuit();
Apple2Activity.this.finish();
new Runnable() {
@Override
public void run() {
try {
Thread.sleep(2000);
} catch (InterruptedException ex) {
// ...
}
System.exit(0);
}
}.run();
quitEmulator();
}
}).setNegativeButton(R.string.cancel, null).create();
registerAndShowDialog(rebootQuitDialog);
}
public void quitEmulator() {
nativeOnQuit();
finish();
new Runnable() {
@Override
public void run() {
try {
Thread.sleep(2000);
} catch (InterruptedException ex) {
// ...
}
System.exit(0);
}
}.run();
}
public void maybeSaveRestore() {
nativeEmulationPause();

4
Android/app/src/main/java/org/deadc0de/apple2ix/Apple2Preferences.java
View File

@ -956,9 +956,7 @@ public enum Apple2Preferences {
public static void resetPreferences(Apple2Activity activity) {
activity.getPreferences(Context.MODE_PRIVATE).edit().clear().commit();
EMULATOR_VERSION.saveInt(activity, BuildConfig.VERSION_CODE);
KeypadPreset.IJKM_SPACE.apply(activity);
loadPreferences(activity);
activity.quitEmulator();
}
public String asciiString() {

2
Android/app/src/main/res/values-fr/strings.xml
View File

@ -132,7 +132,7 @@
<string name="no">Non</string>
<string name="ok">OK</string>
<string name="preferences_reset_title">Reset des préférences</string>
<string name="preferences_reset_summary">Restaurer les préférences par défaut</string>
<string name="preferences_reset_summary">Restaurer les préférences par défaut et quitter l\'émulateur</string>
<string name="preferences_reset_really">Etes-vous sûr de vouloir faire un reset?</string>
<string name="preferences_reset_warning">Vous perdrez toutes vos options de configuration</string>
<string name="quit">Quitter</string>

4
Android/app/src/main/res/values/strings.xml
View File

@ -132,8 +132,8 @@
<string name="no">No</string>
<string name="ok">OK</string>
<string name="preferences_reset_title">Reset preferences</string>
<string name="preferences_reset_summary">Reset preferences to defaults</string>
<string name="preferences_reset_really">Really reset?</string>
<string name="preferences_reset_summary">Reset preferences to defaults and quit emulator</string>
<string name="preferences_reset_really">Really reset and quit?</string>
<string name="preferences_reset_warning">You will lose your settings</string>
<string name="quit">Quit</string>
<string name="quit_reboot">Reboot or quit emulator…</string>