Make KeySpecParser case insensitive

Change-Id: I76c3e9179dd8777d3cf3138ad76513d83672debf

4 files changed, 47 insertions, 24 deletions

diff --git a/java/src/com/android/inputmethod/keyboard/internal/KeySpecParser.java b/java/src/com/android/inputmethod/keyboard/internal/KeySpecParser.java
index 8261400b2..e24cfa0e7 100644
--- a/java/src/com/android/inputmethod/keyboard/internal/KeySpecParser.java
+++ b/java/src/com/android/inputmethod/keyboard/internal/KeySpecParser.java
@@ -76,7 +76,7 @@ public class KeySpecParser {
     }
 
     private static boolean hasIcon(String moreKeySpec) {
-        if (moreKeySpec.startsWith(PREFIX_ICON)) {
+        if (moreKeySpec.regionMatches(true, 0, PREFIX_ICON, 0, PREFIX_ICON.length())) {
             final int end = indexOfLabelEnd(moreKeySpec, 0);
             if (end > 0) {
                 return true;
@@ -88,8 +88,8 @@ public class KeySpecParser {
 
     private static boolean hasCode(String moreKeySpec) {
         final int end = indexOfLabelEnd(moreKeySpec, 0);
-        if (end > 0 && end + 1 < moreKeySpec.length()
-                && moreKeySpec.substring(end + 1).startsWith(PREFIX_CODE)) {
+        if (end > 0 && end + 1 < moreKeySpec.length() && moreKeySpec.regionMatches(
+                true, end + 1, PREFIX_CODE, 0, PREFIX_CODE.length())) {
             return true;
         }
         return false;
@@ -210,9 +210,9 @@ public class KeySpecParser {
 
     public static int parseCode(String text, KeyboardCodesSet codesSet, int defCode) {
         if (text == null) return defCode;
-        if (text.startsWith(PREFIX_CODE)) {
+        if (text.regionMatches(true, 0, PREFIX_CODE, 0, PREFIX_CODE.length())) {
             return codesSet.getCode(text.substring(PREFIX_CODE.length()));
-        } else if (text.startsWith(PREFIX_HEX)) {
+        } else if (text.regionMatches(true, 0, PREFIX_HEX, 0, PREFIX_HEX.length())) {
             return Integer.parseInt(text.substring(PREFIX_HEX.length()), 16);
         } else {
             return Integer.parseInt(text);
@@ -350,20 +350,22 @@ public class KeySpecParser {
                 throw new RuntimeException("too many @string/resource indirection: " + text);
             }
 
+            final int prefixLen = PREFIX_LABEL.length();
             final int size = text.length();
-            if (size < PREFIX_LABEL.length()) {
+            if (size < prefixLen) {
                 return text;
             }
 
             sb = null;
             for (int pos = 0; pos < size; pos++) {
                 final char c = text.charAt(pos);
-                if (text.startsWith(PREFIX_LABEL, pos) && labelsSet != null) {
+                if (text.regionMatches(true, pos, PREFIX_LABEL, 0, prefixLen)
+                        && labelsSet != null) {
                     if (sb == null) {
                         sb = new StringBuilder(text.substring(0, pos));
                     }
-                    final int end = searchLabelNameEnd(text, pos + PREFIX_LABEL.length());
-                    final String name = text.substring(pos + PREFIX_LABEL.length(), end);
+                    final int end = searchLabelNameEnd(text, pos + prefixLen);
+                    final String name = text.substring(pos + prefixLen, end);
                     sb.append(labelsSet.getLabel(name));
                     pos = end - 1;
                 } else if (c == ESCAPE_CHAR) {
@@ -389,8 +391,9 @@ public class KeySpecParser {
         final int size = text.length();
         for (int pos = start; pos < size; pos++) {
             final char c = text.charAt(pos);
-            // String resource name should be consisted of [a-z_0-9].
-            if ((c >= 'a' && c <= 'z') || c == '_' || (c >= '0' && c <= '9')) {
+            // Label name should be consisted of [a-zA-Z_0-9].
+            if ((c >= 'a' && c <= 'z') || c == '_' || (c >= '0' && c <= '9')
+                    || (c >= 'A' && c <= 'Z')) {
                 continue;
             }
             return pos;
@@ -442,17 +445,19 @@ public class KeySpecParser {
         if (moreKeys == null) {
             return defaultValue;
         }
+        final int keyLen = key.length();
         boolean foundValue = false;
         int value = defaultValue;
         for (int i = 0; i < moreKeys.length; i++) {
             final String moreKeySpec = moreKeys[i];
-            if (moreKeySpec == null || !moreKeySpec.startsWith(key)) {
+            if (moreKeySpec == null || !moreKeySpec.regionMatches(true, 0, key, 0, keyLen)) {
                 continue;
             }
             moreKeys[i] = null;
             try {
                 if (!foundValue) {
-                    value = Integer.parseInt(moreKeySpec.substring(key.length()));
+                    value = Integer.parseInt(moreKeySpec.substring(keyLen));
+                    foundValue = true;
                 }
             } catch (NumberFormatException e) {
                 throw new RuntimeException(
@@ -469,7 +474,7 @@ public class KeySpecParser {
         boolean value = false;
         for (int i = 0; i < moreKeys.length; i++) {
             final String moreKeySpec = moreKeys[i];
-            if (moreKeySpec == null || !moreKeySpec.equals(key)) {
+            if (moreKeySpec == null || !moreKeySpec.equalsIgnoreCase(key)) {
                 continue;
             }
             moreKeys[i] = null;
diff --git a/java/src/com/android/inputmethod/keyboard/internal/KeyboardCodesSet.java b/java/src/com/android/inputmethod/keyboard/internal/KeyboardCodesSet.java
index 736a96c56..c10a394c1 100644
--- a/java/src/com/android/inputmethod/keyboard/internal/KeyboardCodesSet.java
+++ b/java/src/com/android/inputmethod/keyboard/internal/KeyboardCodesSet.java
@@ -33,7 +33,10 @@ public class KeyboardCodesSet {
     }
 
     public int getCode(final String name) {
-        final Integer id = sNameToIdMap.get(name);
+        Integer id = sNameToIdMap.get(name);
+        if (id == null) {
+            id = sNameToIdMap.get(name.toLowerCase());
+        }
         if (id == null) throw new RuntimeException("Unknown key code: " + name);
         return mCodes[id];
     }
diff --git a/java/src/com/android/inputmethod/keyboard/internal/KeyboardIconsSet.java b/java/src/com/android/inputmethod/keyboard/internal/KeyboardIconsSet.java
index ded89b1b8..07636249f 100644
--- a/java/src/com/android/inputmethod/keyboard/internal/KeyboardIconsSet.java
+++ b/java/src/com/android/inputmethod/keyboard/internal/KeyboardIconsSet.java
@@ -36,7 +36,9 @@ public class KeyboardIconsSet {
 
     private static final HashMap<Integer, Integer> ATTR_ID_TO_ICON_ID
             = new HashMap<Integer, Integer>();
-    private static final HashMap<String, Integer> NAME_TO_ICON_ID = new HashMap<String, Integer>();
+    // Lower case icon name to icon id map.
+    private static final HashMap<String, Integer> sLowerCaseNameToIdsMap =
+            new HashMap<String, Integer>();
     private static final String[] ICON_NAMES = new String[NUM_ICONS + 1];
 
     private static final int ATTR_UNDEFINED = 0;
@@ -66,7 +68,7 @@ public class KeyboardIconsSet {
         if (attrId != ATTR_UNDEFINED) {
             ATTR_ID_TO_ICON_ID.put(attrId,  iconId);
         }
-        NAME_TO_ICON_ID.put(name, iconId);
+        sLowerCaseNameToIdsMap.put(name.toLowerCase(), iconId);
         ICON_NAMES[iconId] = name;
     }
 
@@ -94,7 +96,10 @@ public class KeyboardIconsSet {
     }
 
     public static int getIconId(final String name) {
-        final Integer iconId = NAME_TO_ICON_ID.get(name);
+        Integer iconId = sLowerCaseNameToIdsMap.get(name);
+        if (iconId == null) {
+            iconId = sLowerCaseNameToIdsMap.get(name.toLowerCase());
+        }
         if (iconId != null) {
             return iconId;
         }
diff --git a/java/src/com/android/inputmethod/keyboard/internal/KeyboardLabelsSet.java b/java/src/com/android/inputmethod/keyboard/internal/KeyboardLabelsSet.java
index 0518b07ff..bd95848a9 100644
--- a/java/src/com/android/inputmethod/keyboard/internal/KeyboardLabelsSet.java
+++ b/java/src/com/android/inputmethod/keyboard/internal/KeyboardLabelsSet.java
@@ -31,7 +31,8 @@ public final class KeyboardLabelsSet {
     // Language to labels map.
     private static final HashMap<String, String[]> sLocaleToLabelsMap =
             new HashMap<String, String[]>();
-    private static final HashMap<String, Integer> sNameToIdMap = new HashMap<String, Integer>();
+    private static final HashMap<String, Integer> sLowerCaseNameToIdsMap =
+            new HashMap<String, Integer>();
 
     private String[] mLabels;
     // Resource name to label map.
@@ -60,12 +61,21 @@ public final class KeyboardLabelsSet {
     }
 
     public String getLabel(final String name) {
-        if (mResourceNameToLabelsMap.containsKey(name)) {
-            return mResourceNameToLabelsMap.get(name);
+        String lowerCaseName = null;
+        String label = mResourceNameToLabelsMap.get(name);
+        if (label == null) {
+            lowerCaseName = name.toLowerCase();
+            label = mResourceNameToLabelsMap.get(lowerCaseName);
+        }
+        if (label != null) {
+            return label;
+        }
+        Integer id = sLowerCaseNameToIdsMap.get(name);
+        if (id == null) {
+            id = sLowerCaseNameToIdsMap.get(lowerCaseName); // lowerCaseName != null
         }
-        final Integer id = sNameToIdMap.get(name);
         if (id == null) throw new RuntimeException("Unknown label: " + name);
-        final String label = (id < mLabels.length) ? mLabels[id] : null;
+        label = (id < mLabels.length) ? mLabels[id] : null;
         return (label == null) ? LANGUAGE_DEFAULT[id] : label;
     }
 
@@ -2492,7 +2502,7 @@ public final class KeyboardLabelsSet {
     static {
         int id = 0;
         for (final String name : NAMES) {
-            sNameToIdMap.put(name, id++);
+            sLowerCaseNameToIdsMap.put(name, id++);
         }
 
         for (int i = 0; i < LANGUAGES_AND_LABELS.length; i += 2) {