diff options
| -rw-r--r-- | core/java/android/hardware/input/PhysicalKeyLayout.java | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/core/java/android/hardware/input/PhysicalKeyLayout.java b/core/java/android/hardware/input/PhysicalKeyLayout.java index 241c452a75eb..3454c399375a 100644 --- a/core/java/android/hardware/input/PhysicalKeyLayout.java +++ b/core/java/android/hardware/input/PhysicalKeyLayout.java @@ -23,8 +23,6 @@ import android.util.SparseIntArray; import android.view.KeyCharacterMap; import android.view.KeyEvent; -import java.util.Locale; - /** * A complimentary class to {@link KeyboardLayoutPreviewDrawable} describing the physical key layout * of a Physical keyboard and provides information regarding the scan codes produced by the physical @@ -339,9 +337,9 @@ final class PhysicalKeyLayout { } int utf8Char = (kcm.get(keyCode, modifierState) & KeyCharacterMap.COMBINING_ACCENT_MASK); if (Character.isValidCodePoint(utf8Char)) { - return String.valueOf(Character.toChars(utf8Char)).toUpperCase(Locale.getDefault()); + return String.valueOf(Character.toChars(utf8Char)); } else { - return String.valueOf(kcm.getDisplayLabel(keyCode)).toUpperCase(Locale.getDefault()); + return String.valueOf(kcm.getDisplayLabel(keyCode)); } } @@ -400,11 +398,11 @@ final class PhysicalKeyLayout { private final String mAltGrText; public KeyGlyph(KeyCharacterMap kcm, int keyCode) { - mBaseText = getKeyText(kcm, keyCode, 0); + mBaseText = getKeyText(kcm, keyCode, KeyEvent.META_CAPS_LOCK_ON); mShiftText = getKeyText(kcm, keyCode, KeyEvent.META_SHIFT_ON | KeyEvent.META_SHIFT_LEFT_ON); mAltGrText = getKeyText(kcm, keyCode, - KeyEvent.META_ALT_ON | KeyEvent.META_ALT_RIGHT_ON); + KeyEvent.META_ALT_ON | KeyEvent.META_ALT_RIGHT_ON | KeyEvent.META_CAPS_LOCK_ON); } public String getBaseText() { |