Merge "Update strings again for refreshed High Contrast Text" into main

This commit is contained in:
Riley Jones
2025-02-04 15:17:23 -08:00
committed by Android (Google) Code Review
3 changed files with 29 additions and 17 deletions

View File

@@ -43,6 +43,7 @@ import com.google.common.annotations.VisibleForTesting;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.util.Locale;
/**
* Handling smooth migration to the new high contrast text appearance
@@ -132,14 +133,25 @@ public class HighContrastTextMigrationReceiver extends BroadcastReceiver {
}
}
private String getNotificationContentText(Context context) {
final String newName = context.getString(
R.string.accessibility_toggle_maximize_text_contrast_preference_title);
final String oldName = context.getString(
R.string.accessibility_toggle_high_text_contrast_preference_title)
.toLowerCase(Locale.getDefault());
final String settingsAppName = context.getString(R.string.settings_label);
return context.getString(
R.string.accessibility_notification_high_contrast_text_body,
newName, oldName, settingsAppName);
}
private void showNotification(Context context) {
Notification.Builder notificationBuilder = new Notification.Builder(context,
NOTIFICATION_CHANNEL)
.setSmallIcon(R.drawable.ic_settings_24dp)
.setContentTitle(context.getString(
R.string.accessibility_notification_high_contrast_text_title))
.setContentText(context.getString(
R.string.accessibility_notification_high_contrast_text_content))
.setContentText(getNotificationContentText(context))
.setFlag(Notification.FLAG_NO_CLEAR, true);
Intent settingsIntent = createHighContrastTextSettingsIntent(context);
@@ -153,8 +165,8 @@ public class HighContrastTextMigrationReceiver extends BroadcastReceiver {
actionIntent, PendingIntent.FLAG_IMMUTABLE);
Notification.Action settingsAction = new Notification.Action.Builder(
/* icon= */ null,
context.getString(
R.string.accessibility_notification_high_contrast_text_action),
context.getString(R.string.accessibility_notification_high_contrast_text_action,
context.getString(R.string.settings_label)),
actionPendingIntent
).build();