From fc98708554b21e983fdbb971e642039fb67e2c3c Mon Sep 17 00:00:00 2001 From: althafvly Date: Mon, 6 Mar 2023 06:42:53 +0000 Subject: [PATCH] DocumentsUI: use translation of files_label for all --- AndroidManifest.xml | 6 +++--- src/com/android/documentsui/files/FilesActivity.java | 2 +- src/com/android/documentsui/files/LauncherActivity.java | 2 +- src/com/android/documentsui/files/MenuManager.java | 2 +- src/com/android/documentsui/picker/PickActivity.java | 2 +- .../android/documentsui/services/FileOperationService.java | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/AndroidManifest.xml b/AndroidManifest.xml index b5c46b414..a1d419e85 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -40,7 +40,7 @@ @@ -100,7 +100,7 @@ diff --git a/src/com/android/documentsui/files/FilesActivity.java b/src/com/android/documentsui/files/FilesActivity.java index 7c09811c9..a2178099a 100644 --- a/src/com/android/documentsui/files/FilesActivity.java +++ b/src/com/android/documentsui/files/FilesActivity.java @@ -290,7 +290,7 @@ public class FilesActivity extends BaseActivity implements AbstractActionHandler Intent intent = getIntent(); return (intent != null && intent.hasExtra(Intent.EXTRA_TITLE)) ? intent.getStringExtra(Intent.EXTRA_TITLE) - : getString(R.string.app_label); + : getString(R.string.files_label); } @Override diff --git a/src/com/android/documentsui/files/LauncherActivity.java b/src/com/android/documentsui/files/LauncherActivity.java index 8cd7dcbb8..6ae3652c5 100644 --- a/src/com/android/documentsui/files/LauncherActivity.java +++ b/src/com/android/documentsui/files/LauncherActivity.java @@ -98,7 +98,7 @@ public class LauncherActivity extends Activity { private void startTask() { Intent intent = createLaunchIntent(this); - intent.putExtra(TASK_LABEL_RES, R.string.launcher_label); + intent.putExtra(TASK_LABEL_RES, R.string.files_label); intent.putExtra(TASK_ICON_RES, R.drawable.launcher_icon); // Forward any flags from the original intent. diff --git a/src/com/android/documentsui/files/MenuManager.java b/src/com/android/documentsui/files/MenuManager.java index 742bc9739..8cabb46ce 100644 --- a/src/com/android/documentsui/files/MenuManager.java +++ b/src/com/android/documentsui/files/MenuManager.java @@ -78,7 +78,7 @@ public final class MenuManager extends com.android.documentsui.MenuManager { public void updateKeyboardShortcutsMenu( List data, IntFunction stringSupplier) { KeyboardShortcutGroup group = new KeyboardShortcutGroup( - stringSupplier.apply(R.string.app_label)); + stringSupplier.apply(R.string.files_label)); group.addItem(new KeyboardShortcutInfo( stringSupplier.apply(R.string.menu_cut_to_clipboard), KeyEvent.KEYCODE_X, KeyEvent.META_CTRL_ON)); diff --git a/src/com/android/documentsui/picker/PickActivity.java b/src/com/android/documentsui/picker/PickActivity.java index c2fbd50a0..263c2654c 100644 --- a/src/com/android/documentsui/picker/PickActivity.java +++ b/src/com/android/documentsui/picker/PickActivity.java @@ -300,7 +300,7 @@ public class PickActivity extends BaseActivity implements ActionHandler.Addons { title = getResources().getString(R.string.title_save); } else { // If all else fails, just call it "Documents". - title = getResources().getString(R.string.app_label); + title = getResources().getString(R.string.files_label); } } } diff --git a/src/com/android/documentsui/services/FileOperationService.java b/src/com/android/documentsui/services/FileOperationService.java index c7be5f4fc..ffbffdfed 100644 --- a/src/com/android/documentsui/services/FileOperationService.java +++ b/src/com/android/documentsui/services/FileOperationService.java @@ -176,7 +176,7 @@ public class FileOperationService extends Service implements Job.Listener { if (features.isNotificationChannelEnabled()) { NotificationChannel channel = new NotificationChannel( NOTIFICATION_CHANNEL_ID, - getString(R.string.app_label), + getString(R.string.files_label), NotificationManager.IMPORTANCE_LOW); notificationManager.createNotificationChannel(channel); } -- GitLab