diff options
| author | Mai <mathew1800@gmail.com> | 2022-12-04 09:15:39 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-12-04 09:15:39 +0000 |
| commit | 51dfab6823c03143099afccb72025b22a0fc1ba4 (patch) | |
| tree | 837609910350121e1554c0129e954d61dc1db2ed /Source/Android/app/src/main/java | |
| parent | 2aa25c03df7982d6e9e24f9dcec17c34b36d829b (diff) | |
| parent | 6a95c565ae729af17d9d89e89b00408a4c54f2aa (diff) | |
Merge pull request #11317 from t895/dialog-adjustment
Android: Use progress indicator in short loading scenarios
Diffstat (limited to 'Source/Android/app/src/main/java')
3 files changed, 4 insertions, 3 deletions
diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/cheats/ui/CheatsActivity.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/cheats/ui/CheatsActivity.java index 0827c3197e..c256d6e8f2 100644 --- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/cheats/ui/CheatsActivity.java +++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/cheats/ui/CheatsActivity.java @@ -208,7 +208,8 @@ public class CheatsActivity extends AppCompatActivity public void downloadGeckoCodes() { AlertDialog progressDialog = new MaterialAlertDialogBuilder(this) - .setMessage(R.string.cheats_downloading) + .setTitle(R.string.cheats_downloading) + .setView(R.layout.dialog_indeterminate_progress) .setCancelable(false) .show(); diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/ui/SettingsActivity.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/ui/SettingsActivity.java index fa42a7a78c..fbef79a777 100644 --- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/ui/SettingsActivity.java +++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/ui/SettingsActivity.java @@ -240,8 +240,7 @@ public final class SettingsActivity extends AppCompatActivity implements Setting { dialog = new MaterialAlertDialogBuilder(this) .setTitle(getString(R.string.load_settings)) - .setView(getLayoutInflater().inflate(R.layout.dialog_indeterminate_progress, null, - false)) + .setView(R.layout.dialog_indeterminate_progress) .create(); } dialog.show(); diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/utils/ThreadUtil.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/utils/ThreadUtil.java index 2321c6a5d6..af464cf94b 100644 --- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/utils/ThreadUtil.java +++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/utils/ThreadUtil.java @@ -31,6 +31,7 @@ public class ThreadUtil Resources resources = activity.getResources(); AlertDialog progressDialog = new MaterialAlertDialogBuilder(activity) .setTitle(progressTitle) + .setView(R.layout.dialog_indeterminate_progress) .setCancelable(false) .create(); |