From 8a4640432991828a0141058420cfa3e835ecaabb Mon Sep 17 00:00:00 2001 From: Charles Lombardo Date: Thu, 10 Nov 2022 22:46:08 -0500 Subject: [PATCH] Android: Change system update dialog title/message when cancelling --- .../ui/SystemUpdateProgressBarDialogFragment.java | 7 ++++++- Source/Android/app/src/main/res/values/strings.xml | 2 ++ 2 files changed, 8 insertions(+), 1 deletion(-) 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 @@ Could not download update files from Nintendo. Please check your Internet connection and try again. "Could not install an update to the Wii system memory. Please refer to logs for more information. The update has been cancelled. It is strongly recommended to finish it in order to avoid inconsistent system software versions. + Please wait for the update to cancel. Update completed Update failed Update cancelled @@ -424,6 +425,7 @@ OK Off Cancel + Cancelling… Clear Disabled Other