piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2024-11-14 21:37:52 -07:00
Code Issues Actions Packages Projects Releases Wiki Activity

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

Browse Source 
Android: Change system update dialog title/message when cancelling
This commit is contained in:
JosJuice 2022-11-11 17:52:57 +01:00 committed by GitHub
commit bf69a0bfe0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/sysupdate/ui/SystemUpdateProgressBarDialogFragment.java
View File

@ -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();
});
}
}

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

@ -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>