Merge "Adjust A11y Shortcut settings to use lowercase shortcut names." into main
This commit is contained in:
@@ -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()));
|
||||
}
|
||||
}
|
||||
|
||||
|
@@ -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()));
|
||||
}
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user