summaryrefslogtreecommitdiff
path: root/Source/Android/app/src
diff options
context:
space:
mode:
authorCharles Lombardo <clombardo169@gmail.com>2022-11-10 22:46:08 -0500
committerCharles Lombardo <clombardo169@gmail.com>2022-11-10 22:46:41 -0500
commit8a4640432991828a0141058420cfa3e835ecaabb (patch)
treed0f370a232e03624b2566d0f5c4f683fbf2ec468 /Source/Android/app/src
parentdca51f3ab0e5e11024556e495dfa4d959093c1d2 (diff)
Android: Change system update dialog title/message when cancelling
Diffstat (limited to 'Source/Android/app/src')
-rw-r--r--Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/sysupdate/ui/SystemUpdateProgressBarDialogFragment.java7
-rw-r--r--Source/Android/app/src/main/res/values/strings.xml2
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>