diff options
| author | 2024-02-13 13:44:35 -0500 | |
|---|---|---|
| committer | 2024-02-13 13:44:35 -0500 | |
| commit | 86fc1e5b3230621f82a0a0c4813c6da1e537e036 (patch) | |
| tree | 57d067ecdfeeb09fdefffc1125996254d6d1c71f /src/android | |
| parent | Merge pull request #12974 from german77/ldn-interface (diff) | |
| download | yuzu-86fc1e5b3230621f82a0a0c4813c6da1e537e036.tar.gz yuzu-86fc1e5b3230621f82a0a0c4813c6da1e537e036.tar.xz yuzu-86fc1e5b3230621f82a0a0c4813c6da1e537e036.zip | |
android: Swap ok and close default strings for MessageDialogFragment
Diffstat (limited to 'src/android')
| -rw-r--r-- | src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/MessageDialogFragment.kt | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/MessageDialogFragment.kt b/src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/MessageDialogFragment.kt index 685df0d59..c370964e1 100644 --- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/MessageDialogFragment.kt +++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/MessageDialogFragment.kt | |||
| @@ -42,9 +42,9 @@ class MessageDialogFragment : DialogFragment() { | |||
| 42 | } else if (positiveButtonString.isNotEmpty()) { | 42 | } else if (positiveButtonString.isNotEmpty()) { |
| 43 | positiveButtonString | 43 | positiveButtonString |
| 44 | } else if (messageDialogViewModel.positiveAction != null) { | 44 | } else if (messageDialogViewModel.positiveAction != null) { |
| 45 | getString(R.string.close) | ||
| 46 | } else { | ||
| 47 | getString(android.R.string.ok) | 45 | getString(android.R.string.ok) |
| 46 | } else { | ||
| 47 | getString(R.string.close) | ||
| 48 | } | 48 | } |
| 49 | 49 | ||
| 50 | val negativeButtonId = requireArguments().getInt(NEGATIVE_BUTTON_TITLE_ID) | 50 | val negativeButtonId = requireArguments().getInt(NEGATIVE_BUTTON_TITLE_ID) |
| @@ -131,7 +131,7 @@ class MessageDialogFragment : DialogFragment() { | |||
| 131 | * @param positiveButtonTitleId String resource ID that will be used for the positive button. | 131 | * @param positiveButtonTitleId String resource ID that will be used for the positive button. |
| 132 | * [positiveButtonTitleString] used if 0. | 132 | * [positiveButtonTitleString] used if 0. |
| 133 | * @param positiveButtonTitleString String that will be used for the positive button. | 133 | * @param positiveButtonTitleString String that will be used for the positive button. |
| 134 | * android.R.string.ok used if empty. android.R.string.close will be used if [positiveAction] | 134 | * android.R.string.close used if empty. android.R.string.ok will be used if [positiveAction] |
| 135 | * is not null. | 135 | * is not null. |
| 136 | * @param positiveAction Lambda to run when the positive button is clicked. | 136 | * @param positiveAction Lambda to run when the positive button is clicked. |
| 137 | * @param showNegativeButton Normally the negative button isn't shown if there is no | 137 | * @param showNegativeButton Normally the negative button isn't shown if there is no |