From a47404e14fe67d5fbb0d1be019522a62ea047484 Mon Sep 17 00:00:00 2001 From: Chun-Ku Lin Date: Sat, 20 May 2023 00:38:59 +0000 Subject: [PATCH] Format the service name with BidiFormatter The dialog's title was shown incorrectly in RTL language when the accessibility service name is in English while the rest of the text is in RTL language. Bug: 279491415 Test: manual Change-Id: I17572c161d34eb0e4d1fa0c4cca1c23531655a38 --- .../accessibility/AccessibilityServiceWarning.java | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/src/com/android/settings/accessibility/AccessibilityServiceWarning.java b/src/com/android/settings/accessibility/AccessibilityServiceWarning.java index 93ec8030b9e..e8ed85c63e3 100644 --- a/src/com/android/settings/accessibility/AccessibilityServiceWarning.java +++ b/src/com/android/settings/accessibility/AccessibilityServiceWarning.java @@ -131,18 +131,17 @@ public class AccessibilityServiceWarning { /** Returns a {@link Dialog} to be shown to confirm that they want to disable a service. */ public static Dialog createDisableDialog(Context context, AccessibilityServiceInfo info, DialogInterface.OnClickListener listener) { - final AlertDialog dialog = new AlertDialog.Builder(context) - .setTitle(context.getString(R.string.disable_service_title, - info.getResolveInfo().loadLabel(context.getPackageManager()))) + CharSequence serviceName = getServiceName(context, info); + + return new AlertDialog.Builder(context) + .setTitle(context.getString(R.string.disable_service_title, serviceName)) .setMessage(context.getString(R.string.disable_service_message, context.getString(R.string.accessibility_dialog_button_stop), - getServiceName(context, info))) + serviceName)) .setCancelable(true) .setPositiveButton(R.string.accessibility_dialog_button_stop, listener) .setNegativeButton(R.string.accessibility_dialog_button_cancel, listener) .create(); - - return dialog; } // Get the service name and bidi wrap it to protect from bidi side effects.