From f6b3ccd074302d47bb84d1d7472f39efefc3fb35 Mon Sep 17 00:00:00 2001
From: Daniel Norman <danielnorman@google.com>
Date: Tue, 4 Feb 2025 15:19:16 -0800
Subject: [PATCH] fix(high contrast text): Uses a new string resource for the
 settings action.

The old string has all non-English translations without format
placeholders, which will fail to build the string on those
languages until translations are added.

Bug: 384791485
Flag: com.android.graphics.hwui.flags.high_contrast_text_small_text_rect
Change-Id: I4565610908d463c05576d5c5d0b083f76802cc9e
---
 res/values/strings.xml                                       | 4 ++--
 .../accessibility/HighContrastTextMigrationReceiver.java     | 5 +++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/res/values/strings.xml b/res/values/strings.xml
index bedc0f63840..86444c3a0dc 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -5507,8 +5507,8 @@
     <string name="accessibility_notification_high_contrast_text_title">Improve text contrast</string>
     <!-- Text content for the notification that high contrast text has been replaced. [CHAR LIMIT=NONE] -->
     <string name="accessibility_notification_high_contrast_text_body"><xliff:g example="Outline text" id="outline_text">%1$s</xliff:g> has replaced <xliff:g example="high contrast text" id="high_contrast_text">%2$s</xliff:g>. You can turn it on in <xliff:g example="Settings" id="settings">%3$s</xliff:g>.</string>
-    <!-- Action for the notification to high contrast text. [CHAR LIMIT=35] -->
-    <string name="accessibility_notification_high_contrast_text_action">Go to <xliff:g example="Settings" id="settings">%1$s</xliff:g></string>
+    <!-- Action for the notification to high contrast text to open the Settings app. [CHAR LIMIT=35] -->
+    <string name="accessibility_notification_high_contrast_text_action_open_settings">Go to <xliff:g example="Settings" id="settings">%1$s</xliff:g></string>
     <!-- Title for the accessibility preference that adds an outline behind text to increase contrast and legibility. [CHAR LIMIT=35] -->
     <string name="accessibility_toggle_maximize_text_contrast_preference_title">Outline text</string>
     <!-- Summary for the accessibility preference to high contrast text. [CHAR LIMIT=NONE] -->
diff --git a/src/com/android/settings/accessibility/HighContrastTextMigrationReceiver.java b/src/com/android/settings/accessibility/HighContrastTextMigrationReceiver.java
index 0b412aec0b9..25fd9c04b32 100644
--- a/src/com/android/settings/accessibility/HighContrastTextMigrationReceiver.java
+++ b/src/com/android/settings/accessibility/HighContrastTextMigrationReceiver.java
@@ -159,10 +159,11 @@ public class HighContrastTextMigrationReceiver extends BroadcastReceiver {
             actionIntent.setAction(ACTION_OPEN_SETTINGS);
             PendingIntent actionPendingIntent = PendingIntent.getBroadcast(context, 0,
                     actionIntent, PendingIntent.FLAG_IMMUTABLE);
+            final int actionResId =
+                    R.string.accessibility_notification_high_contrast_text_action_open_settings;
             Notification.Action settingsAction = new Notification.Action.Builder(
                     /* icon= */ null,
-                    context.getString(R.string.accessibility_notification_high_contrast_text_action,
-                            context.getString(R.string.settings_label)),
+                    context.getString(actionResId, context.getString(R.string.settings_label)),
                     actionPendingIntent
             ).build();