commit b5275911159c8e25b4ecad3eca22163f95715743
author Vaibhav Devmurari <vdevmurari@google.com> Tue Jan 23 14:50:17 2024 +0000
committer Vaibhav Devmurari <vdevmurari@google.com> Tue Jan 23 15:02:01 2024 +0000
tree e49a4d83bb08dc7671e0f23633a8eabb1bcd582e
parent 9812a64b24502edc8913eea4dbac830e03007ec8

Use KCM to capitalize characters, instead of toUpperCase()

Some charaters don't get capitalized by the the keyboard based on
what is configured in the respective KCM, so we should use KCM
to see what the capitalized version of the character would look like.

Bug: 321938411
Test: manual
Change-Id: I896bb8f7526c7e2d6c516d3cc0d30c4567f65236

core/java/android/hardware/input/PhysicalKeyLayout.java

diff --git a/core/java/android/hardware/input/PhysicalKeyLayout.java b/core/java/android/hardware/input/PhysicalKeyLayout.java
index 241c452..3454c39 100644
--- a/core/java/android/hardware/input/PhysicalKeyLayout.java
+++ b/core/java/android/hardware/input/PhysicalKeyLayout.java
@@ -23,8 +23,6 @@
 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 @@
         }
         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 @@
         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() {