Merge "Adjust A11y Shortcut settings to use lowercase shortcut names." into main

This commit is contained in:
Riley Jones
2025-02-03 14:51:18 -08:00
committed by Android (Google) Code Review
2 changed files with 7 additions and 2 deletions

View File

@@ -31,6 +31,7 @@ import com.android.settings.core.BasePreferenceController;
import com.android.settingslib.search.SearchIndexableRaw; import com.android.settingslib.search.SearchIndexableRaw;
import java.util.List; import java.util.List;
import java.util.Locale;
/** /**
* Preference controller for accessibility button preference. * Preference controller for accessibility button preference.
@@ -67,7 +68,8 @@ public class AccessibilityButtonPreferenceController extends BasePreferenceContr
} else { } else {
return mContext.getString( return mContext.getString(
R.string.accessibility_shortcut_unassigned_setting_unavailable_summary, R.string.accessibility_shortcut_unassigned_setting_unavailable_summary,
AccessibilityUtil.getShortcutSummaryList(mContext, SOFTWARE)); AccessibilityUtil.getShortcutSummaryList(mContext, SOFTWARE)
.toString().toLowerCase(Locale.getDefault()));
} }
} }

View File

@@ -31,6 +31,8 @@ import androidx.preference.Preference;
import com.android.settings.R; import com.android.settings.R;
import com.android.settings.core.TogglePreferenceController; import com.android.settings.core.TogglePreferenceController;
import java.util.Locale;
/** /**
* Setting to allow the hardware shortcut to turn on from the lock screen * Setting to allow the hardware shortcut to turn on from the lock screen
*/ */
@@ -87,7 +89,8 @@ public class HardwareShortcutFromLockscreenPreferenceController
} else { } else {
return mContext.getString( return mContext.getString(
R.string.accessibility_shortcut_unassigned_setting_unavailable_summary, R.string.accessibility_shortcut_unassigned_setting_unavailable_summary,
AccessibilityUtil.getShortcutSummaryList(mContext, HARDWARE)); AccessibilityUtil.getShortcutSummaryList(mContext, HARDWARE)
.toString().toLowerCase(Locale.getDefault()));
} }
} }