From 07af74a52e311628f2169a3007cda8fc28ca115b Mon Sep 17 00:00:00 2001 From: Daniel Norman Date: Thu, 30 Jan 2025 09:36:38 -0800 Subject: [PATCH] Adjust A11y Shortcut settings to use lowercase shortcut names. Per go/android-naming these strings should be lowercase when used in the middle of a sentence because they are generic descriptive names and not branded names. Bug: none Change-Id: I0508a5cbdba20a1bd2d6db66e0e7183845e503ad Test: build & install & check string Flag: EXEMPT low risk bugfix --- .../AccessibilityButtonPreferenceController.java | 4 +++- .../HardwareShortcutFromLockscreenPreferenceController.java | 5 ++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/src/com/android/settings/accessibility/AccessibilityButtonPreferenceController.java b/src/com/android/settings/accessibility/AccessibilityButtonPreferenceController.java index d9ee3cd31f7..fa052db041c 100644 --- a/src/com/android/settings/accessibility/AccessibilityButtonPreferenceController.java +++ b/src/com/android/settings/accessibility/AccessibilityButtonPreferenceController.java @@ -31,6 +31,7 @@ import com.android.settings.core.BasePreferenceController; import com.android.settingslib.search.SearchIndexableRaw; import java.util.List; +import java.util.Locale; /** * Preference controller for accessibility button preference. @@ -67,7 +68,8 @@ public class AccessibilityButtonPreferenceController extends BasePreferenceContr } else { return mContext.getString( R.string.accessibility_shortcut_unassigned_setting_unavailable_summary, - AccessibilityUtil.getShortcutSummaryList(mContext, SOFTWARE)); + AccessibilityUtil.getShortcutSummaryList(mContext, SOFTWARE) + .toString().toLowerCase(Locale.getDefault())); } } diff --git a/src/com/android/settings/accessibility/HardwareShortcutFromLockscreenPreferenceController.java b/src/com/android/settings/accessibility/HardwareShortcutFromLockscreenPreferenceController.java index a6d5b7bc7fe..3c9047180b4 100644 --- a/src/com/android/settings/accessibility/HardwareShortcutFromLockscreenPreferenceController.java +++ b/src/com/android/settings/accessibility/HardwareShortcutFromLockscreenPreferenceController.java @@ -31,6 +31,8 @@ import androidx.preference.Preference; import com.android.settings.R; import com.android.settings.core.TogglePreferenceController; +import java.util.Locale; + /** * Setting to allow the hardware shortcut to turn on from the lock screen */ @@ -87,7 +89,8 @@ public class HardwareShortcutFromLockscreenPreferenceController } else { return mContext.getString( R.string.accessibility_shortcut_unassigned_setting_unavailable_summary, - AccessibilityUtil.getShortcutSummaryList(mContext, HARDWARE)); + AccessibilityUtil.getShortcutSummaryList(mContext, HARDWARE) + .toString().toLowerCase(Locale.getDefault())); } }