From 39c002f6cd6438442524bc2c4926d739f32ad639 Mon Sep 17 00:00:00 2001 From: SachinVin Date: Tue, 30 Mar 2021 23:27:13 +0530 Subject: [PATCH] android: use string resources for disk shader progress # Conflicts: # src/android/app/src/main/res/values/strings.xml --- .../citra_emu/disk_shader_cache/DiskShaderCacheProgress.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/android/app/src/main/java/org/citra/citra_emu/disk_shader_cache/DiskShaderCacheProgress.java b/src/android/app/src/main/java/org/citra/citra_emu/disk_shader_cache/DiskShaderCacheProgress.java index 84ed4dac0..5e683e616 100644 --- a/src/android/app/src/main/java/org/citra/citra_emu/disk_shader_cache/DiskShaderCacheProgress.java +++ b/src/android/app/src/main/java/org/citra/citra_emu/disk_shader_cache/DiskShaderCacheProgress.java @@ -93,11 +93,12 @@ public class DiskShaderCacheProgress { private void onUpdateProgress(LoadCallbackStage stage, int progress, int max) { updateHandler.post(()->{ + final EmulationActivity emulationActivity = NativeLibrary.sEmulationActivity.get(); progressBar.setProgress(progress); progressBar.setMax(max); progressText.setText(String.format("%d/%d", progress, max)); if (stage == LoadCallbackStage.Build){ - dialog.setMessage("Building shaders"); + dialog.setMessage(emulationActivity.getString(R.string.disk_cache_building)); } }); } @@ -106,7 +107,7 @@ public class DiskShaderCacheProgress { private static void prepareDialog() { NativeLibrary.sEmulationActivity.get().runOnUiThread(() -> { final EmulationActivity emulationActivity = NativeLibrary.sEmulationActivity.get(); - fragment = ProgressDialogFragment.newInstance("Loading...", "Preparing shaders"); + fragment = ProgressDialogFragment.newInstance(emulationActivity.getString(R.string.disk_shaders_loading), emulationActivity.getString(R.string.disk_shaders_preparing)); fragment.show(emulationActivity.getSupportFragmentManager(), "diskShaders"); });