Merge pull request #11266 from t895/alert-dialog-cancel

Android: Change system update dialog title/message when cancelling

2 files changed, 8 insertions, 1 deletions

diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/sysupdate/ui/SystemUpdateProgressBarDialogFragment.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/sysupdate/ui/SystemUpdateProgressBarDialogFragment.java
index b2c392635e..7f865106b8 100644
--- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/sysupdate/ui/SystemUpdateProgressBarDialogFragment.java
+++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/sysupdate/ui/SystemUpdateProgressBarDialogFragment.java
@@ -95,6 +95,11 @@ public class SystemUpdateProgressBarDialogFragment extends DialogFragment
     SystemUpdateViewModel viewModel =
             new ViewModelProvider(requireActivity()).get(SystemUpdateViewModel.class);
     Button negativeButton = alertDialog.getButton(Dialog.BUTTON_NEGATIVE);
-    negativeButton.setOnClickListener(v -> viewModel.setCanceled());
+    negativeButton.setOnClickListener(v ->
+    {
+      alertDialog.setTitle(getString(R.string.cancelling));
+      alertDialog.setMessage(getString(R.string.update_cancelling));
+      viewModel.setCanceled();
+    });
   }
 }
diff --git a/Source/Android/app/src/main/res/values/strings.xml b/Source/Android/app/src/main/res/values/strings.xml
index 55ea5827e6..bef6431747 100644
--- a/Source/Android/app/src/main/res/values/strings.xml
+++ b/Source/Android/app/src/main/res/values/strings.xml
@@ -216,6 +216,7 @@
     <string name="download_failed">Could not download update files from Nintendo. Please check your Internet connection and try again.</string>
     <string name="import_failed">"Could not install an update to the Wii system memory. Please refer to logs for more information.</string>
     <string name="update_cancelled">The update has been cancelled. It is strongly recommended to finish it in order to avoid inconsistent system software versions.</string>
+    <string name="update_cancelling">Please wait for the update to cancel.</string>
     <string name="update_success_title">Update completed</string>
     <string name="update_failed_title">Update failed</string>
     <string name="update_cancelled_title">Update cancelled</string>
@@ -424,6 +425,7 @@
     <string name="ok">OK</string>
     <string name="off">Off</string>
     <string name="cancel">Cancel</string>
+    <string name="cancelling">Cancelling…</string>
     <string name="clear">Clear</string>
     <string name="disabled">Disabled</string>
     <string name="other">Other</string>