mirror/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-02-28 16:11:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #4643 from SeannyM/settings-saving

Browse Source 
Android: Change Exit Without Saving to Save and Exit
This commit is contained in:
Matthew Parlane 2017-01-11 22:59:42 +13:00 committed by GitHub
commit a3bef102b7
3 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/ui/settings/SettingsActivityPresenter.java
View File

@ -91,8 +91,7 @@ public final class SettingsActivityPresenter
{ {
switch (itemId) switch (itemId)
{ {
case R.id.menu_exit_no_save: case R.id.menu_save_exit:
mShouldSave = false;
mView.finish(); mView.finish();
return true; return true;
} }

6
Source/Android/app/src/main/res/menu/menu_settings.xml
View File

@ -3,9 +3,9 @@
xmlns:app="http://schemas.android.com/apk/res-auto"> xmlns:app="http://schemas.android.com/apk/res-auto">
<item <item
android:id="@+id/menu_exit_no_save" android:id="@+id/menu_save_exit"
android:title="@string/preferences_exit_no_save" android:title="@string/preferences_save_exit"
android:icon="@drawable/ic_cancel" android:icon="@drawable/ic_quicksave"
app:showAsAction="ifRoom"/> app:showAsAction="ifRoom"/>
</menu> </menu>

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

@ -199,7 +199,7 @@
<string name="add_directory_empty_folder">That folder is empty.</string> <string name="add_directory_empty_folder">That folder is empty.</string>
<!-- Preferences Screen --> <!-- Preferences Screen -->
<string name="preferences_exit_no_save">Exit Without Saving</string> <string name="preferences_save_exit">Save and Exit</string>
<string name="preferences_settings">Settings</string> <string name="preferences_settings">Settings</string>
<string name="preferences_extensions">Extension Bindings</string> <string name="preferences_extensions">Extension Bindings</string>