From 2eebf46f407afa73a6ab0834da5633738218f275 Mon Sep 17 00:00:00 2001 From: shaoweishen Date: Mon, 13 Jan 2025 09:10:01 +0000 Subject: [PATCH] [Physical Keyboard] Fix bug for Mouse key page Add default Locale to get keycode for mouse key. Bug: 387152641 Bug: 386907528 Flag: com.android.settings.keyboard.keyboard_and_touchpad_a11y_new_page_enabled Test: atest packages/apps/Settings/tests/robotests/src/com/android/settings/inputmethod Change-Id: I8cc4a08449c13b426ffa24ddc29fd16407b064c8 --- .../settings/inputmethod/MouseKeysImageListAdapter.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/com/android/settings/inputmethod/MouseKeysImageListAdapter.java b/src/com/android/settings/inputmethod/MouseKeysImageListAdapter.java index 43e03b14932..9aab3a4fa64 100644 --- a/src/com/android/settings/inputmethod/MouseKeysImageListAdapter.java +++ b/src/com/android/settings/inputmethod/MouseKeysImageListAdapter.java @@ -118,7 +118,8 @@ public class MouseKeysImageListAdapter extends private String getDisplayLabel(InputDevice currentInputDevice, int keycode) { return String.valueOf(currentInputDevice.getKeyCharacterMap().getDisplayLabel( - currentInputDevice.getKeyCodeForKeyLocation(keycode))).toLowerCase(Locale.ROOT); + currentInputDevice.getKeyCodeForKeyLocation(keycode))).toLowerCase( + Locale.getDefault()); } public static class MouseKeyImageViewHolder extends RecyclerView.ViewHolder {