Make KeySpecParser case insensitive

Change-Id: I76c3e9179dd8777d3cf3138ad76513d83672debf

7 files changed, 39 insertions, 100 deletions

diff --git a/java/res/xml-sw600dp/key_styles_common.xml b/java/res/xml-sw600dp/key_styles_common.xml
index e0676e890..0d54dfedb 100644
--- a/java/res/xml-sw600dp/key_styles_common.xml
+++ b/java/res/xml-sw600dp/key_styles_common.xml
@@ -98,7 +98,6 @@
         latin:code="!code/key_shortcut"
         latin:keyIcon="iconShortcutKey"
         latin:keyIconDisabled="iconDisabledShortcutKey"
-        latin:keyLabelFlags="preserveCase"
         latin:keyActionFlags="noKeyPreview|altCodeWhileTyping"
         latin:backgroundType="functional" />
     <key-style
@@ -132,7 +131,6 @@
         latin:styleName="toSymbolKeyStyle"
         latin:code="!code/key_switch_alpha_symbol"
         latin:keyLabel="!label/label_to_symbol_key"
-        latin:keyLabelFlags="preserveCase"
         latin:keyActionFlags="noKeyPreview"
         latin:backgroundType="functional" />
     <key-style
@@ -146,14 +144,12 @@
         latin:styleName="toMoreSymbolKeyStyle"
         latin:code="!code/key_shift"
         latin:keyLabel="!label/label_to_more_symbol_for_tablet_key"
-        latin:keyLabelFlags="preserveCase"
         latin:keyActionFlags="noKeyPreview"
         latin:backgroundType="functional" />
     <key-style
         latin:styleName="backFromMoreSymbolKeyStyle"
         latin:code="!code/key_shift"
         latin:keyLabel="!label/label_to_symbol_key"
-        latin:keyLabelFlags="preserveCase"
         latin:keyActionFlags="noKeyPreview"
         latin:backgroundType="functional" />
     <key-style
diff --git a/java/res/xml-sw768dp/key_styles_common.xml b/java/res/xml-sw768dp/key_styles_common.xml
index c3e2fd93d..596bccb47 100644
--- a/java/res/xml-sw768dp/key_styles_common.xml
+++ b/java/res/xml-sw768dp/key_styles_common.xml
@@ -97,7 +97,6 @@
         latin:code="!code/key_shortcut"
         latin:keyIcon="iconShortcutKey"
         latin:keyIconDisabled="iconDisabledShortcutKey"
-        latin:keyLabelFlags="preserveCase"
         latin:keyActionFlags="noKeyPreview|altCodeWhileTyping"
         latin:backgroundType="functional" />
     <key-style
@@ -131,7 +130,7 @@
         latin:styleName="toSymbolKeyStyle"
         latin:code="!code/key_switch_alpha_symbol"
         latin:keyLabel="!label/label_to_symbol_key"
-        latin:keyLabelFlags="fontNormal|preserveCase"
+        latin:keyLabelFlags="fontNormal"
         latin:keyActionFlags="noKeyPreview"
         latin:backgroundType="functional" />
     <key-style
@@ -145,14 +144,14 @@
         latin:styleName="toMoreSymbolKeyStyle"
         latin:code="!code/key_shift"
         latin:keyLabel="!label/label_to_more_symbol_for_tablet_key"
-        latin:keyLabelFlags="fontNormal|preserveCase"
+        latin:keyLabelFlags="fontNormal"
         latin:keyActionFlags="noKeyPreview"
         latin:backgroundType="functional" />
     <key-style
         latin:styleName="backFromMoreSymbolKeyStyle"
         latin:code="!code/key_shift"
         latin:keyLabel="!label/label_to_symbol_key"
-        latin:keyLabelFlags="fontNormal|preserveCase"
+        latin:keyLabelFlags="fontNormal"
         latin:keyActionFlags="noKeyPreview"
         latin:backgroundType="functional" />
     <key-style
diff --git a/java/res/xml/key_styles_common.xml b/java/res/xml/key_styles_common.xml
index ec011d08b..f8b6e37fc 100644
--- a/java/res/xml/key_styles_common.xml
+++ b/java/res/xml/key_styles_common.xml
@@ -34,7 +34,7 @@
         <default>
             <key-style
                 latin:styleName="f1MoreKeysStyle"
-                latin:keyLabelFlags="hasPopupHint|preserveCase"
+                latin:keyLabelFlags="hasPopupHint"
                 latin:moreKeys="!label/settings_as_more_key"
                 latin:backgroundType="functional" />
         </default>
@@ -122,7 +122,6 @@
         latin:code="!code/key_shortcut"
         latin:keyIcon="iconShortcutKey"
         latin:keyIconDisabled="iconDisabledShortcutKey"
-        latin:keyLabelFlags="preserveCase"
         latin:keyActionFlags="noKeyPreview|altCodeWhileTyping"
         latin:altCode="!code/key_space"
         latin:parentStyle="f1MoreKeysStyle" />
@@ -159,7 +158,7 @@
                 latin:code="!code/key_switch_alpha_symbol"
                 latin:keyIcon="iconShortcutForLabel"
                 latin:keyLabel="!label/label_to_symbol_with_microphone_key"
-                latin:keyLabelFlags="withIconRight|preserveCase"
+                latin:keyLabelFlags="withIconRight"
                 latin:keyActionFlags="noKeyPreview"
                 latin:backgroundType="functional" />
         </case>
@@ -168,7 +167,6 @@
                 latin:styleName="toSymbolKeyStyle"
                 latin:code="!code/key_switch_alpha_symbol"
                 latin:keyLabel="!label/label_to_symbol_key"
-                latin:keyLabelFlags="preserveCase"
                 latin:keyActionFlags="noKeyPreview"
                 latin:backgroundType="functional" />
         </default>
@@ -184,21 +182,19 @@
         latin:styleName="toMoreSymbolKeyStyle"
         latin:code="!code/key_shift"
         latin:keyLabel="!label/label_to_more_symbol_key"
-        latin:keyLabelFlags="preserveCase"
         latin:keyActionFlags="noKeyPreview"
         latin:backgroundType="functional" />
     <key-style
         latin:styleName="backFromMoreSymbolKeyStyle"
         latin:code="!code/key_shift"
         latin:keyLabel="!label/label_to_symbol_key"
-        latin:keyLabelFlags="preserveCase"
         latin:keyActionFlags="noKeyPreview"
         latin:backgroundType="functional" />
     <key-style
         latin:styleName="punctuationKeyStyle"
         latin:keyLabel="."
         latin:keyHintLabel="!label/keyhintlabel_for_punctuation"
-        latin:keyLabelFlags="hasPopupHint|preserveCase"
+        latin:keyLabelFlags="hasPopupHint"
         latin:moreKeys="!label/more_keys_for_punctuation"
         latin:backgroundType="functional" />
 </merge>
diff --git a/java/res/xml/key_styles_enter.xml b/java/res/xml/key_styles_enter.xml
index f4c7ad46b..506ed47d6 100644
--- a/java/res/xml/key_styles_enter.xml
+++ b/java/res/xml/key_styles_enter.xml
@@ -94,7 +94,7 @@
         latin:styleName="defaultEnterKeyStyle"
         latin:code="!code/key_enter"
         latin:keyIcon="iconReturnKey"
-        latin:keyLabelFlags="autoXScale|preserveCase|followKeyLabelRatio"
+        latin:keyLabelFlags="autoXScale|followKeyLabelRatio"
         latin:keyActionFlags="noKeyPreview"
         latin:backgroundType="functional"
         latin:parentStyle="navigateMoreKeysStyle" />
diff --git a/java/res/xml/rowkeys_georgian1.xml b/java/res/xml/rowkeys_georgian1.xml
index fcdf3fa58..d31a4c79c 100644
--- a/java/res/xml/rowkeys_georgian1.xml
+++ b/java/res/xml/rowkeys_georgian1.xml
@@ -27,55 +27,45 @@
         >
             <Key
                 latin:keyLabel="Q"
-                latin:keyLabelFlags="preserveCase"
                 latin:keyHintLabel="1"
                 latin:additionalMoreKeys="1" />
             <!-- U+10ED: "ჭ" GEORGIAN LETTER CHAR -->
             <Key
                 latin:keyLabel="&#x10ED;"
-                latin:keyLabelFlags="preserveCase"
                 latin:keyHintLabel="2"
                 latin:additionalMoreKeys="2" />
             <Key
                 latin:keyLabel="E"
-                latin:keyLabelFlags="preserveCase"
                 latin:keyHintLabel="3"
                 latin:additionalMoreKeys="3" />
             <!-- U+10E6: "ღ" GEORGIAN LETTER GHAN -->
             <Key
                 latin:keyLabel="&#x10E6;"
-                latin:keyLabelFlags="preserveCase"
                 latin:keyHintLabel="4"
                 latin:additionalMoreKeys="4" />
             <!-- U+10D7: "თ" GEORGIAN LETTER TAN -->
             <Key
                 latin:keyLabel="&#x10D7;"
-                latin:keyLabelFlags="preserveCase"
                 latin:keyHintLabel="5"
                 latin:additionalMoreKeys="5" />
             <Key
                 latin:keyLabel="Y"
-                latin:keyLabelFlags="preserveCase"
                 latin:keyHintLabel="6"
                 latin:additionalMoreKeys="6" />
             <Key
                 latin:keyLabel="U"
-                latin:keyLabelFlags="preserveCase"
                 latin:keyHintLabel="7"
                 latin:additionalMoreKeys="7" />
             <Key
                 latin:keyLabel="I"
-                latin:keyLabelFlags="preserveCase"
                 latin:keyHintLabel="8"
                 latin:additionalMoreKeys="8" />
             <Key
                 latin:keyLabel="O"
-                latin:keyLabelFlags="preserveCase"
                 latin:keyHintLabel="9"
                 latin:additionalMoreKeys="9" />
             <Key
                 latin:keyLabel="P"
-                latin:keyLabelFlags="preserveCase"
                 latin:keyHintLabel="0"
                 latin:additionalMoreKeys="0" />
         </case>
@@ -83,13 +73,11 @@
             <!-- U+10E5: "ქ" GEORGIAN LETTER GHAN -->
             <Key
                 latin:keyLabel="&#x10E5;"
-                latin:keyLabelFlags="preserveCase"
                 latin:keyHintLabel="1"
                 latin:additionalMoreKeys="1" />
             <!-- U+10EC: "წ" GEORGIAN LETTER CIL -->
             <Key
                 latin:keyLabel="&#x10EC;"
-                latin:keyLabelFlags="preserveCase"
                 latin:keyHintLabel="2"
                 latin:additionalMoreKeys="2" />
             <!-- U+10D4: "ე" GEORGIAN LETTER EN
@@ -97,19 +85,16 @@
             <Key
                 latin:keyLabel="&#x10D4;"
                 latin:moreKeys="&#x10F1;"
-                latin:keyLabelFlags="preserveCase"
                 latin:keyHintLabel="3"
                 latin:additionalMoreKeys="3" />
             <!-- U+10E0: "რ" GEORGIAN LETTER RAE -->
             <Key
                 latin:keyLabel="&#x10E0;"
-                latin:keyLabelFlags="preserveCase"
                 latin:keyHintLabel="4"
                 latin:additionalMoreKeys="4" />
             <!-- U+10E2: "ტ" GEORGIAN LETTER TAR -->
             <Key
                 latin:keyLabel="&#x10E2;"
-                latin:keyLabelFlags="preserveCase"
                 latin:keyHintLabel="5"
                 latin:additionalMoreKeys="5" />
             <!-- U+10E7: "ყ" GEORGIAN LETTER QAR
@@ -117,13 +102,11 @@
             <Key
                 latin:keyLabel="&#x10E7;"
                 latin:moreKeys="&#x10F8;"
-                latin:keyLabelFlags="preserveCase"
                 latin:keyHintLabel="6"
                 latin:additionalMoreKeys="6" />
             <!-- U+10E3: "უ" GEORGIAN LETTER UN -->
             <Key
                 latin:keyLabel="&#x10E3;"
-                latin:keyLabelFlags="preserveCase"
                 latin:keyHintLabel="7"
                 latin:additionalMoreKeys="7" />
             <!-- U+10D8: "ი" GEORGIAN LETTER IN
@@ -131,19 +114,16 @@
             <Key
                 latin:keyLabel="&#x10D8;"
                 latin:moreKeys="&#x10F2;"
-                latin:keyLabelFlags="preserveCase"
                 latin:keyHintLabel="8"
                 latin:additionalMoreKeys="8" />
             <!-- U+10DD: "ო" GEORGIAN LETTER ON -->
             <Key
                 latin:keyLabel="&#x10DD;"
-                latin:keyLabelFlags="preserveCase"
                 latin:keyHintLabel="9"
                 latin:additionalMoreKeys="9" />
             <!-- U+10DE: "პ" GEORGIAN LETTER PAR -->
             <Key
                 latin:keyLabel="&#x10DE;"
-                latin:keyLabelFlags="preserveCase"
                 latin:keyHintLabel="0"
                 latin:additionalMoreKeys="0" />
         </default>
diff --git a/java/res/xml/rowkeys_georgian2.xml b/java/res/xml/rowkeys_georgian2.xml
index 5673b9002..cdccda31f 100644
--- a/java/res/xml/rowkeys_georgian2.xml
+++ b/java/res/xml/rowkeys_georgian2.xml
@@ -26,82 +26,64 @@
             latin:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted"
         >
             <Key
-                latin:keyLabel="A"
-                latin:keyLabelFlags="preserveCase" />
+                latin:keyLabel="A" />
             <!-- U+10E8: "შ" GEORGIAN LETTER SHIN -->
             <Key
-                latin:keyLabel="&#x10E8;"
-                latin:keyLabelFlags="preserveCase" />
+                latin:keyLabel="&#x10E8;" />
             <Key
-                latin:keyLabel="D"
-                latin:keyLabelFlags="preserveCase" />
+                latin:keyLabel="D" />
             <Key
-                latin:keyLabel="F"
-                latin:keyLabelFlags="preserveCase" />
+                latin:keyLabel="F" />
             <Key
-                latin:keyLabel="G"
-                latin:keyLabelFlags="preserveCase" />
+                latin:keyLabel="G" />
             <Key
-                latin:keyLabel="H"
-                latin:keyLabelFlags="preserveCase" />
+                latin:keyLabel="H" />
             <!-- U+10DF: "ჟ" GEORGIAN LETTER ZHAR -->
             <Key
-                latin:keyLabel="&#x10DF;"
-                latin:keyLabelFlags="preserveCase" />
+                latin:keyLabel="&#x10DF;" />
             <Key
-                latin:keyLabel="K"
-                latin:keyLabelFlags="preserveCase" />
+                latin:keyLabel="K" />
             <Key
-                latin:keyLabel="L"
-                latin:keyLabelFlags="preserveCase" />
+                latin:keyLabel="L" />
         </case>
         <default>
             <!-- U+10D0: "ა" GEORGIAN LETTER AN
                  U+10FA: "ჺ" GEORGIAN LETTER AIN -->
             <Key
                 latin:keyLabel="&#x10D0;"
-                latin:moreKeys="&#x10FA;"
-                latin:keyLabelFlags="preserveCase" />
+                latin:moreKeys="&#x10FA;" />
             <!-- U+10E1: "ს" GEORGIAN LETTER SAN -->
             <Key
-                latin:keyLabel="&#x10E1;"
-                latin:keyLabelFlags="preserveCase" />
+                latin:keyLabel="&#x10E1;" />
             <!-- U+10D3: "დ" GEORGIAN LETTER DON -->
             <Key
-                latin:keyLabel="&#x10D3;"
-                latin:keyLabelFlags="preserveCase" />
+                latin:keyLabel="&#x10D3;" />
             <!-- U+10E4: "ფ" GEORGIAN LETTER PHAR
                  U+10F6: "ჶ" GEORGIAN LETTER FI -->
             <Key
                 latin:keyLabel="&#x10E4;"
-                latin:moreKeys="&#x10F6;"
-                latin:keyLabelFlags="preserveCase" />
+                latin:moreKeys="&#x10F6;" />
             <!-- U+10D2: "გ" GEORGIAN LETTER GAN
                  U+10F9: "ჹ" GEORGIAN LETTER TURNED GAN -->
             <Key
                 latin:keyLabel="&#x10D2;"
-                latin:moreKeys="&#x10F9;"
-                latin:keyLabelFlags="preserveCase" />
+                latin:moreKeys="&#x10F9;" />
             <!-- U+10F0: "ჰ" GEORGIAN LETTER HAE
                  U+10F5: "ჵ" GEORGIAN LETTER HOE -->
             <Key
                 latin:keyLabel="&#x10F0;"
-                latin:moreKeys="&#x10F5;"
-                latin:keyLabelFlags="preserveCase" />
+                latin:moreKeys="&#x10F5;" />
             <!-- U+10EF: "ჯ" GEORGIAN LETTER JHAN
                  U+10F7: "ჷ" GEORGIAN LETTER YN -->
             <Key
                 latin:keyLabel="&#x10EF;"
-                latin:moreKeys="&#x10F7;"
-                latin:keyLabelFlags="preserveCase" />
+                latin:moreKeys="&#x10F7;" />
             <!-- U+10D9: "კ" GEORGIAN LETTER KAN -->
             <Key
-                latin:keyLabel="&#x10D9;"
-                latin:keyLabelFlags="preserveCase" />
+                latin:keyLabel="&#x10D9;" />
             <!-- U+10DA: "ლ" GEORGIAN LETTER LAS -->
             <Key
-                latin:keyLabel="&#x10DA;"
-                latin:keyLabelFlags="preserveCase" />
+                latin:keyLabel="&#x10DA;" />
         </default>
     </switch>
 </merge>
diff --git a/java/res/xml/rowkeys_georgian3.xml b/java/res/xml/rowkeys_georgian3.xml
index 1c0f45bef..a3714586f 100644
--- a/java/res/xml/rowkeys_georgian3.xml
+++ b/java/res/xml/rowkeys_georgian3.xml
@@ -27,63 +27,49 @@
         >
             <!-- U+10EB: "ძ" GEORGIAN LETTER JIL -->
             <Key
-                latin:keyLabel="&#x10EB;"
-                latin:keyLabelFlags="preserveCase" />
+                latin:keyLabel="&#x10EB;" />
             <Key
-                latin:keyLabel="X"
-                latin:keyLabelFlags="preserveCase" />
+                latin:keyLabel="X" />
             <!-- U+10E9: "ჩ" GEORGIAN LETTER CHIN -->
             <Key
-                latin:keyLabel="&#x10E9;"
-                latin:keyLabelFlags="preserveCase" />
+                latin:keyLabel="&#x10E9;" />
             <Key
-                latin:keyLabel="V"
-                latin:keyLabelFlags="preserveCase" />
+                latin:keyLabel="V" />
             <Key
-                latin:keyLabel="B"
-                latin:keyLabelFlags="preserveCase" />
+                latin:keyLabel="B" />
             <Key
-                latin:keyLabel="N"
-                latin:keyLabelFlags="preserveCase" />
+                latin:keyLabel="N" />
             <Key
-                latin:keyLabel="M"
-                latin:keyLabelFlags="preserveCase" />
+                latin:keyLabel="M" />
         </case>
         <default>
             <!-- U+10D6: "ზ" GEORGIAN LETTER ZEN -->
             <Key
-                latin:keyLabel="&#x10D6;"
-                latin:keyLabelFlags="preserveCase" />
+                latin:keyLabel="&#x10D6;" />
             <!-- U+10EE: "ხ" GEORGIAN LETTER XAN
                  U+10F4: "ჴ" GEORGIAN LETTER HAR -->
             <Key
                 latin:keyLabel="&#x10EE;"
-                latin:moreKeys="&#x10F4;"
-                latin:keyLabelFlags="preserveCase" />
+                latin:moreKeys="&#x10F4;" />
             <!-- U+10EA: "ც" GEORGIAN LETTER CAN -->
             <Key
-                latin:keyLabel="&#x10EA;"
-                latin:keyLabelFlags="preserveCase" />
+                latin:keyLabel="&#x10EA;" />
             <!-- U+10D5: "ვ" GEORGIAN LETTER VIN
                  U+10F3: "ჳ" GEORGIAN LETTER WE -->
             <Key
                 latin:keyLabel="&#x10D5;"
-                latin:moreKeys="&#x10F3;"
-                latin:keyLabelFlags="preserveCase" />
+                latin:moreKeys="&#x10F3;" />
             <!-- U+10D1: "ბ" GEORGIAN LETTER BAN -->
             <Key
-                latin:keyLabel="&#x10D1;"
-                latin:keyLabelFlags="preserveCase" />
+                latin:keyLabel="&#x10D1;" />
             <!-- U+10DC: "ნ" GEORGIAN LETTER NAR
                  U+10FC: "ჼ" MODIFIER LETTER GEORGIAN NAR -->
             <Key
                 latin:keyLabel="&#x10DC;"
-                latin:moreKeys="&#x10FC;"
-                latin:keyLabelFlags="preserveCase" />
+                latin:moreKeys="&#x10FC;" />
             <!-- U+10DB: "მ" GEORGIAN LETTER MAN -->
             <Key
-                latin:keyLabel="&#x10DB;"
-                latin:keyLabelFlags="preserveCase" />
+                latin:keyLabel="&#x10DB;" />
         </default>
     </switch>
 </merge>