diff --git a/android/app/src/main/java/com/github/stenzek/duckstation/EmulationActivity.java b/android/app/src/main/java/com/github/stenzek/duckstation/EmulationActivity.java
index 6a2f2833e..156ee87a2 100644
--- a/android/app/src/main/java/com/github/stenzek/duckstation/EmulationActivity.java
+++ b/android/app/src/main/java/com/github/stenzek/duckstation/EmulationActivity.java
@@ -835,7 +835,7 @@ public class EmulationActivity extends AppCompatActivity implements SurfaceHolde
((ImageButton)view.findViewById(R.id.menu)).setOnClickListener(v -> onMenuClicked());
((ImageButton)view.findViewById(R.id.controller_settings)).setOnClickListener(v -> onControllerSettingsClicked());
((ImageButton)view.findViewById(R.id.settings)).setOnClickListener(v -> onSettingsClicked());
- ((ImageButton)view.findViewById(R.id.quit)).setOnClickListener(v -> onQuitClicked());
+ ((ImageButton)view.findViewById(R.id.close)).setOnClickListener(v -> close(true));
}
@Override
@@ -880,12 +880,6 @@ public class EmulationActivity extends AppCompatActivity implements SurfaceHolde
setContentFragment(new SettingsCollectionFragment(), true);
settingsChanged = true;
}
-
- private void onQuitClicked() {
- close(false);
- emulationActivity.mStopRequested = true;
- emulationActivity.finish();
- }
}
public static class MenuSettingsFragment extends PreferenceFragmentCompat {
@@ -924,6 +918,12 @@ public class EmulationActivity extends AppCompatActivity implements SurfaceHolde
emulationActivity.showAchievementsPopup();
return true;
});
+ createPreference(R.string.emulation_menu_exit_game, R.drawable.ic_baseline_exit_to_app_24, true, preference -> {
+ menuDialogFragment.close(false);
+ emulationActivity.mStopRequested = true;
+ emulationActivity.finish();
+ return true;
+ });
createPreference(R.string.emulation_menu_patch_codes, R.drawable.ic_baseline_tips_and_updates_24, !cheevosChallengeModeEnabled, preference -> {
menuDialogFragment.close(false);
emulationActivity.showPatchesMenu();
diff --git a/android/app/src/main/res/layout/fragment_emulation_activity_overlay.xml b/android/app/src/main/res/layout/fragment_emulation_activity_overlay.xml
index b9356576c..2cdd354d2 100644
--- a/android/app/src/main/res/layout/fragment_emulation_activity_overlay.xml
+++ b/android/app/src/main/res/layout/fragment_emulation_activity_overlay.xml
@@ -93,14 +93,14 @@
android:src="@drawable/ic_baseline_settings_24" />
+ android:contentDescription="Close"
+ android:src="@drawable/ic_baseline_close_24" />
diff --git a/android/app/src/main/res/values/strings.xml b/android/app/src/main/res/values/strings.xml
index 50708cd3f..e689555cd 100644
--- a/android/app/src/main/res/values/strings.xml
+++ b/android/app/src/main/res/values/strings.xml
@@ -345,4 +345,5 @@
Touchscreen Controller Settings
Toggle Controller Analog Mode
Reset Console
+ Exit Game