Merge "Add preliminary Myanmar keyboard"

2014-03-18 05:53:51 +00:00 · 2014-03-18 05:53:51 +00:00 · 6bdb2e60dc
parent c9498827f6 fc3263a75c
commit 6bdb2e60dc
11 changed files with 866 additions and 135 deletions
--- a/java/res/xml-sw600dp/rows_myanmar.xml
+++ b/java/res/xml-sw600dp/rows_myanmar.xml
@ -0,0 +1,73 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+**
+** Copyright 2014, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+**     http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+-->
+
+<merge
+    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
+>
+    <include
+        latin:keyboardLayout="@xml/key_styles_common" />
+    <Row
+        latin:keyWidth="8.1818%p"
+    >
+        <include
+            latin:keyboardLayout="@xml/rowkeys_myanmar1" />
+        <Key
+            latin:keyStyle="deleteKeyStyle"
+            latin:keyWidth="fillRight" />
+        </Row>
+    <Row
+        latin:keyWidth="8.1818%p"
+    >
+        <include
+            latin:keyboardLayout="@xml/rowkeys_myanmar2" />
+    </Row>
+    <Row
+        latin:keyWidth="8.1818%p"
+    >
+        <include
+            latin:keyXPos="4.0909%p"
+            latin:keyboardLayout="@xml/rowkeys_myanmar3" />
+        <Key
+            latin:keyStyle="enterKeyStyle"
+            latin:keyWidth="fillRight" />
+    </Row>
+    <Row
+        latin:keyWidth="8.1818%p"
+    >
+        <Key
+            latin:keyStyle="shiftKeyStyle"
+            latin:keyWidth="10.0%p" />
+        <include
+            latin:keyboardLayout="@xml/rowkeys_myanmar4" />
+        <switch>
+            <case
+                latin:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted"
+            >
+                <Spacer />
+            </case>
+            <default>
+                <include
+                    latin:keyboardLayout="@xml/keys_exclamation_question" />
+            </default>
+        </switch>
+    </Row>
+    <include
+        latin:keyboardLayout="@xml/row_qwerty4" />
+</merge>
--- a/java/res/xml/kbd_myanmar.xml
+++ b/java/res/xml/kbd_myanmar.xml
@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+**
+** Copyright 2014, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+**     http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+-->
+
+<Keyboard
+    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
+    latin:rowHeight="20%p"
+    latin:verticalGap="@fraction/config_key_vertical_gap_5row"
+    latin:keyLetterSize="@fraction/config_key_letter_ratio_5row"
+    latin:keyShiftedLetterHintRatio="@fraction/config_key_shifted_letter_hint_ratio_5row"
+    latin:touchPositionCorrectionData="@array/touch_position_correction_data_default"
+>
+    <include
+        latin:keyboardLayout="@xml/rows_myanmar" />
+</Keyboard>
--- a/java/res/xml/keyboard_layout_set_myanmar.xml
+++ b/java/res/xml/keyboard_layout_set_myanmar.xml
@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+**
+** Copyright 2014, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+**     http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+-->
+
+<KeyboardLayoutSet
+    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin">
+    <Element
+        latin:elementName="alphabet"
+        latin:elementKeyboard="@xml/kbd_myanmar"
+        latin:enableProximityCharsCorrection="true" />
+    <Element
+        latin:elementName="alphabetAutomaticShifted"
+        latin:elementKeyboard="@xml/kbd_myanmar"
+        latin:enableProximityCharsCorrection="true" />
+    <!-- On these shifted alphabet layouts the proximity characters correction should be disabled
+         because the letters on these layouts aren't the ones in different case of the above
+         unshifted layouts. -->
+    <Element
+        latin:elementName="alphabetManualShifted"
+        latin:elementKeyboard="@xml/kbd_myanmar" />
+    <Element
+        latin:elementName="alphabetShiftLocked"
+        latin:elementKeyboard="@xml/kbd_myanmar" />
+    <Element
+        latin:elementName="alphabetShiftLockShifted"
+        latin:elementKeyboard="@xml/kbd_myanmar" />
+    <Element
+        latin:elementName="symbols"
+        latin:elementKeyboard="@xml/kbd_symbols" />
+    <Element
+        latin:elementName="symbolsShifted"
+        latin:elementKeyboard="@xml/kbd_symbols_shift" />
+    <Element
+        latin:elementName="phone"
+        latin:elementKeyboard="@xml/kbd_phone" />
+    <Element
+        latin:elementName="phoneSymbols"
+        latin:elementKeyboard="@xml/kbd_phone_symbols" />
+    <Element
+        latin:elementName="number"
+        latin:elementKeyboard="@xml/kbd_number" />
+</KeyboardLayoutSet>
--- a/java/res/xml/method.xml
+++ b/java/res/xml/method.xml
@ -64,6 +64,7 @@
    mk: Macedonian/south_slavic
    mn_MN: Mongolian (Mongolia)/mongolian
    ms_MY: Malay (Malaysia)/qwerty
+    (my_MM: Myanmar (Myanmar)/myanmar) # This is a preliminary keyboard layout.
    nb: Norwegian Bokmål/nordic
    ne_NP: Nepali (Nepal) Romanized/nepali_romanized
    ne_NP: Nepali (Nepal) Traditional/nepali_traditional
@ -431,6 +432,8 @@
            android:imeSubtypeExtraValue="KeyboardLayoutSet=mongolian,EmojiCapable"
            android:isAsciiCapable="false"
    />
+    <!-- TODO: This Myanmar keyboard is a preliminary layout.
+               This isn't based on the final specification. -->
    <subtype android:icon="@drawable/ic_ime_switcher_dark"
            android:label="@string/subtype_generic"
            android:subtypeId="0x84c87c61"
@ -439,6 +442,14 @@
            android:imeSubtypeExtraValue="KeyboardLayoutSet=qwerty,AsciiCapable,EmojiCapable"
            android:isAsciiCapable="true"
    />
+    <subtype android:icon="@drawable/ic_ime_switcher_dark"
+            android:label="@string/subtype_generic"
+            android:subtypeId="0xea266ea4"
+            android:imeSubtypeLocale="my_MM"
+            android:imeSubtypeMode="keyboard"
+            android:imeSubtypeExtraValue="KeyboardLayoutSet=myanmar,EmojiCapable"
+            android:isAsciiCapable="false"
+    />
    <subtype android:icon="@drawable/ic_ime_switcher_dark"
            android:label="@string/subtype_generic"
            android:subtypeId="0x3f12ee14"
--- a/java/res/xml/rowkeys_myanmar1.xml
+++ b/java/res/xml/rowkeys_myanmar1.xml
@ -0,0 +1,134 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+**
+** Copyright 2014, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+**     http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+-->
+
+<merge
+    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
+>
+    <switch>
+        <case
+            latin:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted"
+        >
+            <!-- U+100E: "ဎ" MYANMAR LETTER DDHA -->
+            <Key
+                latin:keySpec="&#x100E;"
+                latin:keyLabelFlags="fontNormal" />
+            <!-- U+100D: "ဍ" MYANMAR LETTER DDA -->
+            <Key
+                latin:keySpec="&#x100D;"
+                latin:keyLabelFlags="fontNormal" />
+            <!-- U+1052: "ၒ" MYANMAR LETTER VOCALIC R -->
+            <Key
+                latin:keySpec="&#x1052;"
+                latin:keyLabelFlags="fontNormal" />
+            <!-- U+100B: "ဋ" MYANMAR LETTER TTA -->
+            <Key
+                latin:keySpec="&#x100B;"
+                latin:keyLabelFlags="fontNormal" />
+            <!-- U+1053: "ၓ" MYANMAR LETTER VOCALIC RR -->
+            <Key
+                latin:keySpec="&#x1053;"
+                latin:keyLabelFlags="fontNormal" />
+            <!-- U+1054: "ၔ" MYANMAR LETTER VOCALIC L -->
+            <Key
+                latin:keySpec="&#x1054;"
+                latin:keyLabelFlags="fontNormal" />
+            <!-- U+1055: "ၕ" MYANMAR LETTER VOCALIC LL -->
+            <Key
+                latin:keySpec="&#x1055;"
+                latin:keyLabelFlags="fontNormal" />
+            <!-- U+101B: "ရ" MYANMAR LETTER RA -->
+            <Key
+                latin:keySpec="&#x101B;"
+                latin:keyLabelFlags="fontNormal" />
+            <Key
+                latin:keySpec="*" />
+            <Key
+                latin:keySpec="(" />
+            <Key
+                latin:keySpec=")" />
+        </case>
+        <default>
+            <!-- U+1050: "ၐ" MYANMAR LETTER SHA -->
+            <Key
+                latin:keySpec="&#x1050;"
+                latin:keyLabelFlags="fontNormal" />
+            <!-- U+1041: "၁" MYANMAR DIGIT ONE -->
+            <Key
+                latin:keySpec="&#x1041;"
+                latin:keyHintLabel="1"
+                latin:additionalMoreKeys="1"
+                latin:keyLabelFlags="fontNormal" />
+            <!-- U+1042: "၂" MYANMAR DIGIT TWO -->
+            <Key
+                latin:keySpec="&#x1042;"
+                latin:keyHintLabel="2"
+                latin:additionalMoreKeys="2"
+                latin:keyLabelFlags="fontNormal" />
+            <!-- U+1043: "၃" MYANMAR DIGIT THREE -->
+            <Key
+                latin:keySpec="&#x1043;"
+                latin:keyHintLabel="3"
+                latin:additionalMoreKeys="3"
+                latin:keyLabelFlags="fontNormal" />
+            <!-- U+1044: "၄" MYANMAR DIGIT FOUR -->
+            <Key
+                latin:keySpec="&#x1044;"
+                latin:keyHintLabel="4"
+                latin:additionalMoreKeys="4"
+                latin:keyLabelFlags="fontNormal" />
+            <!-- U+1045: "၅" MYANMAR DIGIT FIVE -->
+            <Key
+                latin:keySpec="&#x1045;"
+                latin:keyHintLabel="5"
+                latin:additionalMoreKeys="5"
+                latin:keyLabelFlags="fontNormal" />
+            <!-- U+1046: "၆" MYANMAR DIGIT SIX -->
+            <Key
+                latin:keySpec="&#x1046;"
+                latin:keyHintLabel="6"
+                latin:additionalMoreKeys="6"
+                latin:keyLabelFlags="fontNormal" />
+            <!-- U+1047: "၇" MYANMAR DIGIT SEVEN -->
+            <Key
+                latin:keySpec="&#x1047;"
+                latin:keyHintLabel="7"
+                latin:additionalMoreKeys="7"
+                latin:keyLabelFlags="fontNormal" />
+            <!-- U+1048: "၈" MYANMAR DIGIT EIGHT -->
+            <Key
+                latin:keySpec="&#x1048;"
+                latin:keyHintLabel="8"
+                latin:additionalMoreKeys="8"
+                latin:keyLabelFlags="fontNormal" />
+            <!-- U+1049: "၉" MYANMAR DIGIT NINE -->
+            <Key
+                latin:keySpec="&#x1049;"
+                latin:keyHintLabel="9"
+                latin:additionalMoreKeys="9"
+                latin:keyLabelFlags="fontNormal" />
+            <!-- U+1040: "၀" MYANMAR DIGIT ZERO -->
+            <Key
+                latin:keySpec="&#x1040;"
+                latin:keyHintLabel="0"
+                latin:additionalMoreKeys="0"
+                latin:keyLabelFlags="fontNormal" />
+        </default>
+    </switch>
+</merge>
--- a/java/res/xml/rowkeys_myanmar2.xml
+++ b/java/res/xml/rowkeys_myanmar2.xml
@ -0,0 +1,120 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+**
+** Copyright 2014, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+**     http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+-->
+
+<merge
+    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
+>
+    <switch>
+        <case
+            latin:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted"
+        >
+            <!-- U+1008: "ဈ" MYANMAR LETTER JHA -->
+            <Key
+                latin:keySpec="&#x1008;"
+                latin:keyLabelFlags="fontNormal" />
+            <!-- U+101D: "ဝ" MYANMAR LETTER WA -->
+            <Key
+                latin:keySpec="&#x101D;"
+                latin:keyLabelFlags="fontNormal" />
+            <!-- U+1023: "ဣ" MYANMAR LETTER I -->
+            <Key
+                latin:keySpec="&#x1023;"
+                latin:keyLabelFlags="fontNormal" />
+            <!-- U+104E: "၎" MYANMAR SYMBOL AFOREMENTIONED -->
+            <Key
+                latin:keySpec="&#x104E;"
+                latin:keyLabelFlags="fontNormal" />
+            <!-- U+1024: "ဤ" MYANMAR LETTER II -->
+            <Key
+                latin:keySpec="&#x1024;"
+                latin:keyLabelFlags="fontNormal" />
+            <!-- U+104C: "၌" MYANMAR SYMBOL LOCATIVE -->
+            <Key
+                latin:keySpec="&#x104C;"
+                latin:keyLabelFlags="fontNormal" />
+            <!-- U+1025: "ဥ" MYANMAR LETTER U -->
+            <Key
+                latin:keySpec="&#x1025;"
+                latin:keyLabelFlags="fontNormal" />
+            <!-- U+104D: "၍" MYANMAR SYMBOL COMPLETED -->
+            <Key
+                latin:keySpec="&#x104D;"
+                latin:keyLabelFlags="fontNormal" />
+            <!-- U+103F: "ဿ" MYANMAR LETTER GREAT SA -->
+            <Key
+                latin:keySpec="&#x103F;"
+                latin:keyLabelFlags="fontNormal|autoXScale" />
+            <!-- U+100F: "ဏ" MYANMAR LETTER NNA -->
+            <Key
+                latin:keySpec="&#x100F;"
+                latin:keyLabelFlags="fontNormal" />
+            <!-- U+1027: "ဧ" MYANMAR LETTER E -->
+            <Key
+                latin:keySpec="&#x1027;"
+                latin:keyLabelFlags="fontNormal" />
+        </case>
+        <default>
+            <!-- U+1006: "ဆ" MYANMAR LETTER CHA -->
+            <Key
+                latin:keySpec="&#x1006;"
+                latin:keyLabelFlags="fontNormal" />
+            <!-- U+1010: "တ" MYANMAR LETTER TA -->
+            <Key
+                latin:keySpec="&#x1010;"
+                latin:keyLabelFlags="fontNormal" />
+            <!-- U+1014: "န" MYANMAR LETTER NA -->
+            <Key
+                latin:keySpec="&#x1014;"
+                latin:keyLabelFlags="fontNormal" />
+            <!-- U+1019: "မ" MYANMAR LETTER MA -->
+            <Key
+                latin:keySpec="&#x1019;"
+                latin:keyLabelFlags="fontNormal" />
+            <!-- U+1021: "အ" MYANMAR LETTER A -->
+            <Key
+                latin:keySpec="&#x1021;"
+                latin:keyLabelFlags="fontNormal" />
+            <!-- U+1015: "ပ" MYANMAR LETTER PA -->
+            <Key
+                latin:keySpec="&#x1015;"
+                latin:keyLabelFlags="fontNormal" />
+            <!-- U+1000: "က" MYANMAR LETTER KA -->
+            <Key
+                latin:keySpec="&#x1000;"
+                latin:keyLabelFlags="fontNormal" />
+            <!-- U+1004: "င" MYANMAR LETTER NGA -->
+            <Key
+                latin:keySpec="&#x1004;"
+                latin:keyLabelFlags="fontNormal" />
+            <!-- U+101E: "သ" MYANMAR LETTER SA -->
+            <Key
+                latin:keySpec="&#x101E;"
+                latin:keyLabelFlags="fontNormal" />
+            <!-- U+1005: "စ" MYANMAR LETTER CA -->
+            <Key
+                latin:keySpec="&#x1005;"
+                latin:keyLabelFlags="fontNormal" />
+            <!-- U+101F: "ဟ" MYANMAR LETTER HA -->
+            <Key
+                latin:keySpec="&#x101F;"
+                latin:keyLabelFlags="fontNormal" />
+        </default>
+    </switch>
+</merge>
--- a/java/res/xml/rowkeys_myanmar3.xml
+++ b/java/res/xml/rowkeys_myanmar3.xml
@ -0,0 +1,112 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+**
+** Copyright 2014, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+**     http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+-->
+
+<merge
+    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
+>
+    <switch>
+        <case
+            latin:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted"
+        >
+            <!-- U+1017: "ဗ" MYANMAR LETTER BA -->
+            <Key
+                latin:keySpec="&#x1017;"
+                latin:keyLabelFlags="fontNormal" />
+            <!-- U+103E: "ှ" MYANMAR CONSONANT SIGN MEDIAL HA -->
+            <Key
+                latin:keySpec="&#x103E;"
+                latin:keyLabelFlags="fontNormal" />
+            <!-- U+102E: "ီ" MYANMAR VOWEL SIGN II -->
+            <Key
+                latin:keySpec="&#x102E;"
+                latin:keyLabelFlags="fontNormal" />
+            <!-- U+1039: "္" MYANMAR SIGN VIRAMA -->
+            <Key
+                latin:keySpec="&#x1039;"
+                latin:keyLabelFlags="fontNormal" />
+            <!-- U+103D: "ွ" MYANMAR CONSONANT SIGN MEDIAL WA -->
+            <Key
+                latin:keySpec="&#x103D;"
+                latin:keyLabelFlags="fontNormal" />
+            <!-- U+1036: "ံ" MYANMAR SIGN ANUSVARA -->
+            <Key
+                latin:keySpec="&#x1036;"
+                latin:keyLabelFlags="fontNormal" />
+            <!-- U+1032: "ဲ" MYANMAR VOWEL SIGN AI -->
+            <Key
+                latin:keySpec="&#x1032;"
+                latin:keyLabelFlags="fontNormal" />
+            <!-- U+1012: "ဒ" MYANMAR LETTER DA -->
+            <Key
+                latin:keySpec="&#x1012;"
+                latin:keyLabelFlags="fontNormal" />
+            <!-- U+1013: "ဓ" MYANMAR LETTER DHA -->
+            <Key
+                latin:keySpec="&#x1013;"
+                latin:keyLabelFlags="fontNormal" />
+            <!-- U+1002: "ဂ" MYANMAR LETTER GA -->
+            <Key
+                latin:keySpec="&#x1002;"
+                latin:keyLabelFlags="fontNormal" />
+        </case>
+        <default>
+            <!-- U+1031: "ေ" MYANMAR VOWEL SIGN E -->
+            <Key
+                latin:keySpec="&#x1031;"
+                latin:keyLabelFlags="fontNormal" />
+            <!-- U+103B: "ျ" MYANMAR CONSONANT SIGN MEDIAL YA -->
+            <Key
+                latin:keySpec="&#x103B;"
+                latin:keyLabelFlags="fontNormal" />
+            <!-- U+102D: "ိ" MYANMAR VOWEL SIGN I -->
+            <Key
+                latin:keySpec="&#x102D;"
+                latin:keyLabelFlags="fontNormal" />
+            <!-- U+103A: "်" MYANMAR SIGN ASAT -->
+            <Key
+                latin:keySpec="&#x103A;"
+                latin:keyLabelFlags="fontNormal" />
+            <!-- U+102B: "ါ" MYANMAR VOWEL SIGN TALL AA -->
+            <Key
+                latin:keySpec="&#x102B;"
+                latin:keyLabelFlags="fontNormal" />
+            <!-- U+1037: "့" MYANMAR SIGN DOT BELOW -->
+            <Key
+                latin:keySpec="&#x1037;"
+                latin:keyLabelFlags="fontNormal" />
+            <!-- U+103C: "ြ" MYANMAR CONSONANT SIGN MEDIAL RA -->
+            <Key
+                latin:keySpec="&#x103C;"
+                latin:keyLabelFlags="fontNormal" />
+            <!-- U+102F: "ု" MYANMAR VOWEL SIGN U -->
+            <Key
+                latin:keySpec="&#x102F;"
+                latin:keyLabelFlags="fontNormal" />
+            <!-- U+1030: "ူ" MYANMAR VOWEL SIGN UU -->
+            <Key
+                latin:keySpec="&#x1030;"
+                latin:keyLabelFlags="fontNormal" />
+            <!-- U+1038: "း" MYANMAR SIGN VISARGA -->
+            <Key
+                latin:keySpec="&#x1038;"
+                latin:keyLabelFlags="fontNormal" />
+        </default>
+    </switch>
+</merge>
--- a/java/res/xml/rowkeys_myanmar4.xml
+++ b/java/res/xml/rowkeys_myanmar4.xml
@ -0,0 +1,104 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+**
+** Copyright 2014, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+**     http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+-->
+
+<merge
+    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
+>
+    <switch>
+        <case
+            latin:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted"
+        >
+            <!-- U+1007: "ဇ" MYANMAR LETTER JA -->
+            <Key
+                latin:keySpec="&#x1007;"
+                latin:keyLabelFlags="fontNormal" />
+            <!-- U+100C: "ဌ" MYANMAR LETTER TTHA -->
+            <Key
+                latin:keySpec="&#x100C;"
+                latin:keyLabelFlags="fontNormal" />
+            <!-- U+1003: "ဃ" MYANMAR LETTER GHA -->
+            <Key
+                latin:keySpec="&#x1003;"
+                latin:keyLabelFlags="fontNormal" />
+            <!-- U+1020: "ဠ" MYANMAR LETTER LLA -->
+            <Key
+                latin:keySpec="&#x1020;"
+                latin:keyLabelFlags="fontNormal" />
+            <!-- U+101A: "ယ" MYANMAR LETTER YA -->
+            <Key
+                latin:keySpec="&#x101A;"
+                latin:keyLabelFlags="fontNormal" />
+            <!-- U+1009: "ဉ" MYANMAR LETTER NYA -->
+            <Key
+                latin:keySpec="&#x1009;"
+                latin:keyLabelFlags="fontNormal" />
+            <!-- U+1026: "ဦ" MYANMAR LETTER UU -->
+            <Key
+                latin:keySpec="&#x1026;"
+                latin:keyLabelFlags="fontNormal" />
+            <!-- U+102A: "ဪ" MYANMAR LETTER AU -->
+            <Key
+                latin:keySpec="&#x102A;"
+                latin:keyLabelFlags="fontNormal|autoXScale" />
+            <!-- U+1051: "ၑ" MYANMAR LETTER SSA -->
+            <Key
+                latin:keySpec="&#x1051;"
+                latin:keyLabelFlags="fontNormal" />
+        </case>
+        <default>
+            <!-- U+1016: "ဖ" MYANMAR LETTER PHA -->
+            <Key
+                latin:keySpec="&#x1016;"
+                latin:keyLabelFlags="fontNormal" />
+            <!-- U+1011: "ထ" MYANMAR LETTER THA -->
+            <Key
+                latin:keySpec="&#x1011;"
+                latin:keyLabelFlags="fontNormal" />
+            <!-- U+1001: "ခ" MYANMAR LETTER KHA -->
+            <Key
+                latin:keySpec="&#x1001;"
+                latin:keyLabelFlags="fontNormal" />
+            <!-- U+101C: "လ" MYANMAR LETTER LA -->
+            <Key
+                latin:keySpec="&#x101C;"
+                latin:keyLabelFlags="fontNormal" />
+            <!-- U+1018: "ဘ" MYANMAR LETTER BHA -->
+            <Key
+                latin:keySpec="&#x1018;"
+                latin:keyLabelFlags="fontNormal" />
+            <!-- U+100A: "ည" MYANMAR LETTER NNYA -->
+            <Key
+                latin:keySpec="&#x100A;"
+                latin:keyLabelFlags="fontNormal" />
+            <!-- U+102C: "ာ" MYANMAR VOWEL SIGN AA -->
+            <Key
+                latin:keySpec="&#x102C;"
+                latin:keyLabelFlags="fontNormal" />
+            <!-- U+1029: "ဩ" MYANMAR LETTER O -->
+            <Key
+                latin:keySpec="&#x1029;"
+                latin:keyLabelFlags="fontNormal" />
+            <!-- U+104F: "၏" MYANMAR SYMBOL GENITIVE -->
+            <Key
+                latin:keySpec="&#x104F;"
+                latin:keyLabelFlags="fontNormal" />
+        </default>
+    </switch>
+</merge>
--- a/java/res/xml/rows_myanmar.xml
+++ b/java/res/xml/rows_myanmar.xml
@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+**
+** Copyright 2014, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+**     http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+-->
+
+<merge
+    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
+>
+    <include
+        latin:keyboardLayout="@xml/key_styles_common" />
+    <Row
+        latin:keyWidth="9.0909%p"
+    >
+        <include
+            latin:keyboardLayout="@xml/rowkeys_myanmar1" />
+    </Row>
+    <Row
+        latin:keyWidth="9.0909%p"
+    >
+        <include
+            latin:keyboardLayout="@xml/rowkeys_myanmar2" />
+    </Row>
+    <Row
+        latin:keyWidth="9.0909%p"
+    >
+        <include
+            latin:keyXPos="4.5454%p"
+            latin:keyboardLayout="@xml/rowkeys_myanmar3" />
+    </Row>
+    <Row
+        latin:keyWidth="9.0909%p"
+    >
+        <Key
+            latin:keyStyle="shiftKeyStyle" />
+        <include
+            latin:keyboardLayout="@xml/rowkeys_myanmar4" />
+        <Key
+            latin:keyStyle="deleteKeyStyle" />
+    </Row>
+    <include
+        latin:keyboardLayout="@xml/row_qwerty4" />
+</merge>
--- a/java/src/com/android/inputmethod/keyboard/internal/KeyboardTextsTable.java
+++ b/java/src/com/android/inputmethod/keyboard/internal/KeyboardTextsTable.java
@ -87,9 +87,9 @@ public final class KeyboardTextsTable {
        /*   5:23 */ "double_quotes",
        /*   6:22 */ "single_quotes",
        /*   7:21 */ "more_keys_for_c",
-        /*   8:20 */ "more_keys_for_s",
-        /*   9:20 */ "more_keys_for_n",
-        /*  10:20 */ "label_to_alpha_key",
+        /*   8:21 */ "label_to_alpha_key",
+        /*   9:20 */ "more_keys_for_s",
+        /*  10:20 */ "more_keys_for_n",
        /*  11:14 */ "more_keys_for_y",
        /*  12:13 */ "more_keys_for_d",
        /*  13:12 */ "more_keys_for_z",
@ -260,13 +260,11 @@ public final class KeyboardTextsTable {
        /* ~ more_keys_for_i */
        /* double_quotes */ "!text/double_lqm_rqm",
        /* single_quotes */ "!text/single_lqm_rqm",
-        /* more_keys_for_c ~ */
-        EMPTY, EMPTY, EMPTY,
-        /* ~ more_keys_for_n */
+        /* more_keys_for_c */ EMPTY,
        // Label for "switch to alphabetic" key.
        /* label_to_alpha_key */ "ABC",
-        /* more_keys_for_y ~ */
-        EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY,
+        /* more_keys_for_s ~ */
+        EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY,
        /* ~ more_keys_for_g */
        /* single_angle_quotes */ "!text/single_laqm_raqm",
        /* double_angle_quotes */ "!text/double_laqm_raqm",
@ -508,12 +506,11 @@ public final class KeyboardTextsTable {
        // U+0133: "ĳ" LATIN SMALL LIGATURE IJ
        /* more_keys_for_i */ "\u00ED,\u00EC,\u00EF,\u00EE,\u012F,\u012B,\u0133",
        /* double_quotes ~ */
-        null, null, null, null,
+        null, null, null, null, null,
        /* ~ more_keys_for_s */
        // U+00F1: "ñ" LATIN SMALL LETTER N WITH TILDE
        // U+0144: "ń" LATIN SMALL LETTER N WITH ACUTE
        /* more_keys_for_n */ "\u00F1,\u0144",
-        /* label_to_alpha_key */ null,
        // U+00FD: "ý" LATIN SMALL LETTER Y WITH ACUTE
        // U+0133: "ĳ" LATIN SMALL LIGATURE IJ
        /* more_keys_for_y */ "\u00FD,\u0133",
@ -522,17 +519,17 @@ public final class KeyboardTextsTable {
    /* Language ar: Arabic */
    private static final String[] LANGUAGE_ar = {
        /* more_keys_for_a ~ */
-        null, null, null, null, null, null, null, null, null, null,
-        /* ~ more_keys_for_n */
+        null, null, null, null, null, null, null, null,
+        /* ~ more_keys_for_c */
        // Label for "switch to alphabetic" key.
        // U+0623: "أ" ARABIC LETTER ALEF WITH HAMZA ABOVE
        // U+200C: ZERO WIDTH NON-JOINER
        // U+0628: "ب" ARABIC LETTER BEH
        // U+062C: "ج" ARABIC LETTER JEEM
        /* label_to_alpha_key */ "\u0623\u200C\u0628\u200C\u062C",
-        /* more_keys_for_y ~ */
+        /* more_keys_for_s ~ */
        null, null, null, null, null, null, null, null, null, null, null, null, null, null, null,
-        null, null, null, null, null, null,
+        null, null, null, null, null, null, null, null,
        /* ~ more_keys_for_cyrillic_soft_sign */
        /* more_keys_for_punctuation */ "!fixedColumnOrder!8,\",\',#,-,:,!,\u060C,\u061F,@,&,\\%,+,\u061B,/,(|),)|(",
        /* more_keys_for_nordic_row2_11 */ null,
@ -686,13 +683,14 @@ public final class KeyboardTextsTable {
        // U+0107: "ć" LATIN SMALL LETTER C WITH ACUTE
        // U+010D: "č" LATIN SMALL LETTER C WITH CARON
        /* more_keys_for_c */ "\u00E7,\u0107,\u010D",
+        /* label_to_alpha_key */ null,
        // U+015F: "ş" LATIN SMALL LETTER S WITH CEDILLA
        // U+00DF: "ß" LATIN SMALL LETTER SHARP S
        // U+015B: "ś" LATIN SMALL LETTER S WITH ACUTE
        // U+0161: "š" LATIN SMALL LETTER S WITH CARON
        /* more_keys_for_s */ "\u015F,\u00DF,\u015B,\u0161",
        /* more_keys_for_n ~ */
-        null, null, null, null, null, null, null,
+        null, null, null, null, null, null,
        /* ~ more_keys_for_l */
        // U+011F: "ğ" LATIN SMALL LETTER G WITH BREVE
        /* more_keys_for_g */ "\u011F",
@ -705,16 +703,14 @@ public final class KeyboardTextsTable {
        /* ~ more_keys_for_i */
        /* double_quotes */ "!text/double_9qm_lqm",
        /* single_quotes */ "!text/single_9qm_lqm",
-        /* more_keys_for_c ~ */
-        null, null, null,
-        /* ~ more_keys_for_n */
+        /* more_keys_for_c */ null,
        // Label for "switch to alphabetic" key.
        // U+0410: "А" CYRILLIC CAPITAL LETTER A
        // U+0411: "Б" CYRILLIC CAPITAL LETTER BE
        // U+0412: "В" CYRILLIC CAPITAL LETTER VE
        /* label_to_alpha_key */ "\u0410\u0411\u0412",
-        /* more_keys_for_y ~ */
-        null, null, null, null, null, null, null, null, null, null, null,
+        /* more_keys_for_s ~ */
+        null, null, null, null, null, null, null, null, null, null, null, null, null,
        /* ~ more_keys_for_k */
        // U+0451: "ё" CYRILLIC SMALL LETTER IO
        /* more_keys_for_cyrillic_ie */ "\u0451",
@ -740,9 +736,8 @@ public final class KeyboardTextsTable {
        /* ~ more_keys_for_i */
        // single_quotes of Bulgarian is default single_quotes_right_left.
        /* double_quotes */ "!text/double_9qm_lqm",
-        /* single_quotes ~ */
-        null, null, null, null,
-        /* ~ more_keys_for_n */
+        /* single_quotes */ null,
+        /* more_keys_for_c */ null,
        // Label for "switch to alphabetic" key.
        // U+0410: "А" CYRILLIC CAPITAL LETTER A
        // U+0411: "Б" CYRILLIC CAPITAL LETTER BE
@ -800,12 +795,13 @@ public final class KeyboardTextsTable {
        // U+0107: "ć" LATIN SMALL LETTER C WITH ACUTE
        // U+010D: "č" LATIN SMALL LETTER C WITH CARON
        /* more_keys_for_c */ "\u00E7,\u0107,\u010D",
+        /* label_to_alpha_key */ null,
        /* more_keys_for_s */ null,
        // U+00F1: "ñ" LATIN SMALL LETTER N WITH TILDE
        // U+0144: "ń" LATIN SMALL LETTER N WITH ACUTE
        /* more_keys_for_n */ "\u00F1,\u0144",
-        /* label_to_alpha_key ~ */
-        null, null, null, null, null,
+        /* more_keys_for_y ~ */
+        null, null, null, null,
        /* ~ more_keys_for_t */
        // U+00B7: "·" MIDDLE DOT
        // U+0142: "ł" LATIN SMALL LETTER L WITH STROKE
@ -880,6 +876,7 @@ public final class KeyboardTextsTable {
        // U+00E7: "ç" LATIN SMALL LETTER C WITH CEDILLA
        // U+0107: "ć" LATIN SMALL LETTER C WITH ACUTE
        /* more_keys_for_c */ "\u010D,\u00E7,\u0107",
+        /* label_to_alpha_key */ null,
        // U+0161: "š" LATIN SMALL LETTER S WITH CARON
        // U+00DF: "ß" LATIN SMALL LETTER SHARP S
        // U+015B: "ś" LATIN SMALL LETTER S WITH ACUTE
@ -888,7 +885,6 @@ public final class KeyboardTextsTable {
        // U+00F1: "ñ" LATIN SMALL LETTER N WITH TILDE
        // U+0144: "ń" LATIN SMALL LETTER N WITH ACUTE
        /* more_keys_for_n */ "\u0148,\u00F1,\u0144",
-        /* label_to_alpha_key */ null,
        // U+00FD: "ý" LATIN SMALL LETTER Y WITH ACUTE
        // U+00FF: "ÿ" LATIN SMALL LETTER Y WITH DIAERESIS
        /* more_keys_for_y */ "\u00FD,\u00FF",
@ -940,6 +936,7 @@ public final class KeyboardTextsTable {
        /* double_quotes */ "!text/double_9qm_lqm",
        /* single_quotes */ "!text/single_9qm_lqm",
        /* more_keys_for_c */ null,
+        /* label_to_alpha_key */ null,
        // U+00DF: "ß" LATIN SMALL LETTER SHARP S
        // U+015B: "ś" LATIN SMALL LETTER S WITH ACUTE
        // U+0161: "š" LATIN SMALL LETTER S WITH CARON
@ -947,7 +944,6 @@ public final class KeyboardTextsTable {
        // U+00F1: "ñ" LATIN SMALL LETTER N WITH TILDE
        // U+0144: "ń" LATIN SMALL LETTER N WITH ACUTE
        /* more_keys_for_n */ "\u00F1,\u0144",
-        /* label_to_alpha_key */ null,
        // U+00FD: "ý" LATIN SMALL LETTER Y WITH ACUTE
        // U+00FF: "ÿ" LATIN SMALL LETTER Y WITH DIAERESIS
        /* more_keys_for_y */ "\u00FD,\u00FF",
@ -1014,6 +1010,7 @@ public final class KeyboardTextsTable {
        /* double_quotes */ "!text/double_9qm_lqm",
        /* single_quotes */ "!text/single_9qm_lqm",
        /* more_keys_for_c */ null,
+        /* label_to_alpha_key */ null,
        // U+00DF: "ß" LATIN SMALL LETTER SHARP S
        // U+015B: "ś" LATIN SMALL LETTER S WITH ACUTE
        // U+0161: "š" LATIN SMALL LETTER S WITH CARON
@ -1021,8 +1018,8 @@ public final class KeyboardTextsTable {
        // U+00F1: "ñ" LATIN SMALL LETTER N WITH TILDE
        // U+0144: "ń" LATIN SMALL LETTER N WITH ACUTE
        /* more_keys_for_n */ "\u00F1,\u0144",
-        /* label_to_alpha_key ~ */
-        null, null, null, null, null, null, null,
+        /* more_keys_for_y ~ */
+        null, null, null, null, null, null,
        /* ~ more_keys_for_g */
        /* single_angle_quotes */ "!text/single_raqm_laqm",
        /* double_angle_quotes */ "!text/double_raqm_laqm",
@ -1050,8 +1047,8 @@ public final class KeyboardTextsTable {
    /* Language el: Greek */
    private static final String[] LANGUAGE_el = {
        /* more_keys_for_a ~ */
-        null, null, null, null, null, null, null, null, null, null,
-        /* ~ more_keys_for_n */
+        null, null, null, null, null, null, null, null,
+        /* ~ more_keys_for_c */
        // Label for "switch to alphabetic" key.
        // U+0391: "Α" GREEK CAPITAL LETTER ALPHA
        // U+0392: "Β" GREEK CAPITAL LETTER BETA
@ -1101,6 +1098,7 @@ public final class KeyboardTextsTable {
        /* single_quotes */ null,
        // U+00E7: "ç" LATIN SMALL LETTER C WITH CEDILLA
        /* more_keys_for_c */ "\u00E7",
+        /* label_to_alpha_key */ null,
        // U+00DF: "ß" LATIN SMALL LETTER SHARP S
        /* more_keys_for_s */ "\u00DF",
        // U+00F1: "ñ" LATIN SMALL LETTER N WITH TILDE
@ -1169,6 +1167,7 @@ public final class KeyboardTextsTable {
        // U+00E7: "ç" LATIN SMALL LETTER C WITH CEDILLA
        // U+010B: "ċ" LATIN SMALL LETTER C WITH DOT ABOVE
        /* more_keys_for_c */ "\u0107,\u010D,\u00E7,\u010B",
+        /* label_to_alpha_key */ null,
        // U+00DF: "ß" LATIN SMALL LETTER SHARP S
        // U+0161: "š" LATIN SMALL LETTER S WITH CARON
        // U+015B: "ś" LATIN SMALL LETTER S WITH ACUTE
@ -1182,7 +1181,6 @@ public final class KeyboardTextsTable {
        // U+0149: "ŉ" LATIN SMALL LETTER N PRECEDED BY APOSTROPHE
        // U+014B: "ŋ" LATIN SMALL LETTER ENG
        /* more_keys_for_n */ "\u00F1,\u0144,\u0146,\u0148,\u0149,\u014B",
-        /* label_to_alpha_key */ null,
        // U+00FD: "ý" LATIN SMALL LETTER Y WITH ACUTE
        // U+0177: "ŷ" LATIN SMALL LETTER Y WITH CIRCUMFLEX
        // U+00FF: "ÿ" LATIN SMALL LETTER Y WITH DIAERESIS
@ -1309,13 +1307,14 @@ public final class KeyboardTextsTable {
        // U+0107: "ć" LATIN SMALL LETTER C WITH ACUTE
        // U+010D: "č" LATIN SMALL LETTER C WITH CARON
        /* more_keys_for_c */ "\u00E7,\u0107,\u010D",
+        /* label_to_alpha_key */ null,
        /* more_keys_for_s */ null,
        // U+00F1: "ñ" LATIN SMALL LETTER N WITH TILDE
        // U+0144: "ń" LATIN SMALL LETTER N WITH ACUTE
        /* more_keys_for_n */ "\u00F1,\u0144",
-        /* label_to_alpha_key ~ */
+        /* more_keys_for_y ~ */
        null, null, null, null, null, null, null, null, null, null, null, null, null, null, null,
-        null, null, null, null, null, null, null,
+        null, null, null, null, null, null,
        /* ~ more_keys_for_cyrillic_soft_sign */
        // U+00A1: "¡" INVERTED EXCLAMATION MARK
        // U+00BF: "¿" INVERTED QUESTION MARK
@ -1375,6 +1374,7 @@ public final class KeyboardTextsTable {
        // U+00E7: "ç" LATIN SMALL LETTER C WITH CEDILLA
        // U+0107: "ć" LATIN SMALL LETTER C WITH ACUTE
        /* more_keys_for_c */ "\u010D,\u00E7,\u0107",
+        /* label_to_alpha_key */ null,
        // U+0161: "š" LATIN SMALL LETTER S WITH CARON
        // U+00DF: "ß" LATIN SMALL LETTER SHARP S
        // U+015B: "ś" LATIN SMALL LETTER S WITH ACUTE
@ -1384,7 +1384,6 @@ public final class KeyboardTextsTable {
        // U+00F1: "ñ" LATIN SMALL LETTER N WITH TILDE
        // U+0144: "ń" LATIN SMALL LETTER N WITH ACUTE
        /* more_keys_for_n */ "\u0146,\u00F1,\u0144",
-        /* label_to_alpha_key */ null,
        // U+00FD: "ý" LATIN SMALL LETTER Y WITH ACUTE
        // U+00FF: "ÿ" LATIN SMALL LETTER Y WITH DIAERESIS
        /* more_keys_for_y */ "\u00FD,\u00FF",
@ -1428,16 +1427,16 @@ public final class KeyboardTextsTable {
    /* Language fa: Persian */
    private static final String[] LANGUAGE_fa = {
        /* more_keys_for_a ~ */
-        null, null, null, null, null, null, null, null, null, null,
-        /* ~ more_keys_for_n */
+        null, null, null, null, null, null, null, null,
+        /* ~ more_keys_for_c */
        // Label for "switch to alphabetic" key.
        // U+0627: "ا" ARABIC LETTER ALEF
        // U+200C: ZERO WIDTH NON-JOINER
        // U+0628: "ب" ARABIC LETTER BEH
        // U+067E: "پ" ARABIC LETTER PEH
        /* label_to_alpha_key */ "\u0627\u200C\u0628\u200C\u067E",
-        /* more_keys_for_y ~ */
-        null, null, null, null, null, null, null, null,
+        /* more_keys_for_s ~ */
+        null, null, null, null, null, null, null, null, null, null,
        /* ~ double_angle_quotes */
        // U+FDFC: "﷼" RIAL SIGN
        /* keylabel_for_currency */ "\uFDFC",
@ -1591,14 +1590,14 @@ public final class KeyboardTextsTable {
        // U+00FC: "ü" LATIN SMALL LETTER U WITH DIAERESIS
        /* more_keys_for_u */ "\u00FC",
        /* more_keys_for_e ~ */
-        null, null, null, null, null,
-        /* ~ more_keys_for_c */
+        null, null, null, null, null, null,
+        /* ~ label_to_alpha_key */
        // U+0161: "š" LATIN SMALL LETTER S WITH CARON
        // U+00DF: "ß" LATIN SMALL LETTER SHARP S
        // U+015B: "ś" LATIN SMALL LETTER S WITH ACUTE
        /* more_keys_for_s */ "\u0161,\u00DF,\u015B",
        /* more_keys_for_n ~ */
-        null, null, null, null,
+        null, null, null,
        /* ~ more_keys_for_d */
        // U+017E: "ž" LATIN SMALL LETTER Z WITH CARON
        // U+017A: "ź" LATIN SMALL LETTER Z WITH ACUTE
@ -1671,9 +1670,9 @@ public final class KeyboardTextsTable {
        // U+0107: "ć" LATIN SMALL LETTER C WITH ACUTE
        // U+010D: "č" LATIN SMALL LETTER C WITH CARON
        /* more_keys_for_c */ "\u00E7,\u0107,\u010D",
-        /* more_keys_for_s ~ */
+        /* label_to_alpha_key ~ */
        null, null, null,
-        /* ~ label_to_alpha_key */
+        /* ~ more_keys_for_n */
        // U+00FF: "ÿ" LATIN SMALL LETTER Y WITH DIAERESIS
        /* more_keys_for_y */ "%,\u00FF",
        /* more_keys_for_d ~ */
@ -1700,15 +1699,15 @@ public final class KeyboardTextsTable {
    /* Language hi: Hindi */
    private static final String[] LANGUAGE_hi = {
        /* more_keys_for_a ~ */
-        null, null, null, null, null, null, null, null, null, null,
-        /* ~ more_keys_for_n */
+        null, null, null, null, null, null, null, null,
+        /* ~ more_keys_for_c */
        // Label for "switch to alphabetic" key.
        // U+0915: "क" DEVANAGARI LETTER KA
        // U+0916: "ख" DEVANAGARI LETTER KHA
        // U+0917: "ग" DEVANAGARI LETTER GA
        /* label_to_alpha_key */ "\u0915\u0916\u0917",
-        /* more_keys_for_y ~ */
-        null, null, null, null, null, null, null, null,
+        /* more_keys_for_s ~ */
+        null, null, null, null, null, null, null, null, null, null,
        /* ~ double_angle_quotes */
        // U+20B9: "₹" INDIAN RUPEE SIGN
        /* keylabel_for_currency */ "\u20B9",
@ -1763,6 +1762,7 @@ public final class KeyboardTextsTable {
        // U+0107: "ć" LATIN SMALL LETTER C WITH ACUTE
        // U+00E7: "ç" LATIN SMALL LETTER C WITH CEDILLA
        /* more_keys_for_c */ "\u010D,\u0107,\u00E7",
+        /* label_to_alpha_key */ null,
        // U+0161: "š" LATIN SMALL LETTER S WITH CARON
        // U+015B: "ś" LATIN SMALL LETTER S WITH ACUTE
        // U+00DF: "ß" LATIN SMALL LETTER SHARP S
@ -1770,7 +1770,6 @@ public final class KeyboardTextsTable {
        // U+00F1: "ñ" LATIN SMALL LETTER N WITH TILDE
        // U+0144: "ń" LATIN SMALL LETTER N WITH ACUTE
        /* more_keys_for_n */ "\u00F1,\u0144",
-        /* label_to_alpha_key */ null,
        /* more_keys_for_y */ null,
        // U+0111: "đ" LATIN SMALL LETTER D WITH STROKE
        /* more_keys_for_d */ "\u0111",
@ -1840,16 +1839,16 @@ public final class KeyboardTextsTable {
    /* Language hy_AM: Armenian (Armenia) */
    private static final String[] LANGUAGE_hy_AM = {
        /* more_keys_for_a ~ */
-        null, null, null, null, null, null, null, null, null, null,
-        /* ~ more_keys_for_n */
+        null, null, null, null, null, null, null, null,
+        /* ~ more_keys_for_c */
        // Label for "switch to alphabetic" key.
        // U+0531: "Ա" ARMENIAN CAPITAL LETTER AYB
        // U+0532: "Բ" ARMENIAN CAPITAL LETTER BEN
        // U+0533: "Գ" ARMENIAN CAPITAL LETTER GIM
        /* label_to_alpha_key */ "\u0531\u0532\u0533",
-        /* more_keys_for_y ~ */
+        /* more_keys_for_s ~ */
        null, null, null, null, null, null, null, null, null, null, null, null, null, null, null,
-        null, null, null, null, null, null,
+        null, null, null, null, null, null, null, null,
        /* ~ more_keys_for_cyrillic_soft_sign */
        // U+058A: "֊" ARMENIAN HYPHEN
        // U+055C: "՜" ARMENIAN EXCLAMATION MARK
@ -1933,7 +1932,7 @@ public final class KeyboardTextsTable {
        /* single_quotes */ "!text/single_9qm_lqm",
        /* more_keys_for_c ~ */
        null, null, null, null,
-        /* ~ label_to_alpha_key */
+        /* ~ more_keys_for_n */
        // U+00FD: "ý" LATIN SMALL LETTER Y WITH ACUTE
        // U+00FF: "ÿ" LATIN SMALL LETTER Y WITH DIAERESIS
        /* more_keys_for_y */ "\u00FD,\u00FF",
@ -1996,16 +1995,14 @@ public final class KeyboardTextsTable {
        /* ~ more_keys_for_i */
        /* double_quotes */ "!text/double_rqm_9qm",
        /* single_quotes */ "!text/single_rqm_9qm",
-        /* more_keys_for_c ~ */
-        null, null, null,
-        /* ~ more_keys_for_n */
+        /* more_keys_for_c */ null,
        // Label for "switch to alphabetic" key.
        // U+05D0: "א" HEBREW LETTER ALEF
        // U+05D1: "ב" HEBREW LETTER BET
        // U+05D2: "ג" HEBREW LETTER GIMEL
        /* label_to_alpha_key */ "\u05D0\u05D1\u05D2",
-        /* more_keys_for_y ~ */
-        null, null, null, null, null, null, null, null,
+        /* more_keys_for_s ~ */
+        null, null, null, null, null, null, null, null, null, null,
        /* ~ double_angle_quotes */
        // U+20AA: "₪" NEW SHEQEL SIGN
        /* keylabel_for_currency */ "\u20AA",
@ -2055,9 +2052,7 @@ public final class KeyboardTextsTable {
        /* ~ more_keys_for_i */
        /* double_quotes */ "!text/double_9qm_lqm",
        /* single_quotes */ "!text/single_9qm_lqm",
-        /* more_keys_for_c ~ */
-        null, null, null,
-        /* ~ more_keys_for_n */
+        /* more_keys_for_c */ null,
        // Label for "switch to alphabetic" key.
        // U+10D0: "ა" GEORGIAN LETTER AN
        // U+10D1: "ბ" GEORGIAN LETTER BAN
@ -2068,15 +2063,15 @@ public final class KeyboardTextsTable {
    /* Language kk: Kazakh */
    private static final String[] LANGUAGE_kk = {
        /* more_keys_for_a ~ */
-        null, null, null, null, null, null, null, null, null, null,
-        /* ~ more_keys_for_n */
+        null, null, null, null, null, null, null, null,
+        /* ~ more_keys_for_c */
        // Label for "switch to alphabetic" key.
        // U+0410: "А" CYRILLIC CAPITAL LETTER A
        // U+0411: "Б" CYRILLIC CAPITAL LETTER BE
        // U+0412: "В" CYRILLIC CAPITAL LETTER VE
        /* label_to_alpha_key */ "\u0410\u0411\u0412",
-        /* more_keys_for_y ~ */
-        null, null, null, null, null, null, null, null, null, null, null,
+        /* more_keys_for_s ~ */
+        null, null, null, null, null, null, null, null, null, null, null, null, null,
        /* ~ more_keys_for_k */
        // U+0451: "ё" CYRILLIC SMALL LETTER IO
        /* more_keys_for_cyrillic_ie */ "\u0451",
@ -2124,21 +2119,21 @@ public final class KeyboardTextsTable {
    /* Language km_KH: Khmer (Cambodia) */
    private static final String[] LANGUAGE_km_KH = {
        /* more_keys_for_a ~ */
-        null, null, null, null, null, null, null, null, null, null,
-        /* ~ more_keys_for_n */
+        null, null, null, null, null, null, null, null,
+        /* ~ more_keys_for_c */
        // Label for "switch to alphabetic" key.
        // U+1780: "ក" KHMER LETTER KA
        // U+1781: "ខ" KHMER LETTER KHA
        // U+1782: "គ" KHMER LETTER KO
        /* label_to_alpha_key */ "\u1780\u1781\u1782",
-        /* more_keys_for_y ~ */
+        /* more_keys_for_s ~ */
+        null, null, null, null, null, null, null, null, null, null, null, null, null, null, null,
        null, null, null, null, null, null, null, null, null, null, null, null, null, null, null,
        null, null, null, null, null, null, null, null, null, null, null, null, null, null, null,
        null, null, null, null, null, null, null, null, null, null, null, null, null, null, null,
        null, null, null, null, null, null, null, null, null, null, null, null, null, null, null,
        null, null, null, null, null, null, null, null, null, null, null, null, null, null, null,
        null, null, null, null, null, null, null, null, null, null, null, null, null, null, null,
-        null, null, null, null, null, null, null, null, null, null, null, null, null,
        /* ~ more_keys_for_east_slavic_row2_11 */
        // U+17DB: "៛" KHMER CURRENCY SYMBOL RIEL
        /* more_keys_for_currency_dollar */ "\u17DB,\u00A2,\u00A3,\u20AC,\u00A5,\u20B1",
@ -2147,15 +2142,15 @@ public final class KeyboardTextsTable {
    /* Language ky: Kirghiz */
    private static final String[] LANGUAGE_ky = {
        /* more_keys_for_a ~ */
-        null, null, null, null, null, null, null, null, null, null,
-        /* ~ more_keys_for_n */
+        null, null, null, null, null, null, null, null,
+        /* ~ more_keys_for_c */
        // Label for "switch to alphabetic" key.
        // U+0410: "А" CYRILLIC CAPITAL LETTER A
        // U+0411: "Б" CYRILLIC CAPITAL LETTER BE
        // U+0412: "В" CYRILLIC CAPITAL LETTER VE
        /* label_to_alpha_key */ "\u0410\u0411\u0412",
-        /* more_keys_for_y ~ */
-        null, null, null, null, null, null, null, null, null, null, null,
+        /* more_keys_for_s ~ */
+        null, null, null, null, null, null, null, null, null, null, null, null, null,
        /* ~ more_keys_for_k */
        // U+0451: "ё" CYRILLIC SMALL LETTER IO
        /* more_keys_for_cyrillic_ie */ "\u0451",
@ -2190,15 +2185,15 @@ public final class KeyboardTextsTable {
    /* Language lo_LA: Lao (Laos) */
    private static final String[] LANGUAGE_lo_LA = {
        /* more_keys_for_a ~ */
-        null, null, null, null, null, null, null, null, null, null,
-        /* ~ more_keys_for_n */
+        null, null, null, null, null, null, null, null,
+        /* ~ more_keys_for_c */
        // Label for "switch to alphabetic" key.
        // U+0E81: "ກ" LAO LETTER KO
        // U+0E82: "ຂ" LAO LETTER KHO SUNG
        // U+0E84: "ຄ" LAO LETTER KHO TAM
        /* label_to_alpha_key */ "\u0E81\u0E82\u0E84",
-        /* more_keys_for_y ~ */
-        null, null, null, null, null, null, null, null,
+        /* more_keys_for_s ~ */
+        null, null, null, null, null, null, null, null, null, null,
        /* ~ double_angle_quotes */
        // U+20AD: "₭" KIP SIGN
        /* keylabel_for_currency */ "\u20AD",
@ -2258,6 +2253,7 @@ public final class KeyboardTextsTable {
        // U+00E7: "ç" LATIN SMALL LETTER C WITH CEDILLA
        // U+0107: "ć" LATIN SMALL LETTER C WITH ACUTE
        /* more_keys_for_c */ "\u010D,\u00E7,\u0107",
+        /* label_to_alpha_key */ null,
        // U+0161: "š" LATIN SMALL LETTER S WITH CARON
        // U+00DF: "ß" LATIN SMALL LETTER SHARP S
        // U+015B: "ś" LATIN SMALL LETTER S WITH ACUTE
@ -2267,7 +2263,6 @@ public final class KeyboardTextsTable {
        // U+00F1: "ñ" LATIN SMALL LETTER N WITH TILDE
        // U+0144: "ń" LATIN SMALL LETTER N WITH ACUTE
        /* more_keys_for_n */ "\u0146,\u00F1,\u0144",
-        /* label_to_alpha_key */ null,
        // U+00FD: "ý" LATIN SMALL LETTER Y WITH ACUTE
        // U+00FF: "ÿ" LATIN SMALL LETTER Y WITH DIAERESIS
        /* more_keys_for_y */ "\u00FD,\u00FF",
@ -2352,6 +2347,7 @@ public final class KeyboardTextsTable {
        // U+00E7: "ç" LATIN SMALL LETTER C WITH CEDILLA
        // U+0107: "ć" LATIN SMALL LETTER C WITH ACUTE
        /* more_keys_for_c */ "\u010D,\u00E7,\u0107",
+        /* label_to_alpha_key */ null,
        // U+0161: "š" LATIN SMALL LETTER S WITH CARON
        // U+00DF: "ß" LATIN SMALL LETTER SHARP S
        // U+015B: "ś" LATIN SMALL LETTER S WITH ACUTE
@ -2361,7 +2357,6 @@ public final class KeyboardTextsTable {
        // U+00F1: "ñ" LATIN SMALL LETTER N WITH TILDE
        // U+0144: "ń" LATIN SMALL LETTER N WITH ACUTE
        /* more_keys_for_n */ "\u0146,\u00F1,\u0144",
-        /* label_to_alpha_key */ null,
        // U+00FD: "ý" LATIN SMALL LETTER Y WITH ACUTE
        // U+00FF: "ÿ" LATIN SMALL LETTER Y WITH DIAERESIS
        /* more_keys_for_y */ "\u00FD,\u00FF",
@ -2400,16 +2395,14 @@ public final class KeyboardTextsTable {
        /* ~ more_keys_for_i */
        /* double_quotes */ "!text/double_9qm_lqm",
        /* single_quotes */ "!text/single_9qm_lqm",
-        /* more_keys_for_c ~ */
-        null, null, null,
-        /* ~ more_keys_for_n */
+        /* more_keys_for_c */ null,
        // Label for "switch to alphabetic" key.
        // U+0410: "А" CYRILLIC CAPITAL LETTER A
        // U+0411: "Б" CYRILLIC CAPITAL LETTER BE
        // U+0412: "В" CYRILLIC CAPITAL LETTER VE
        /* label_to_alpha_key */ "\u0410\u0411\u0412",
-        /* more_keys_for_y ~ */
-        null, null, null, null, null, null, null, null, null, null, null,
+        /* more_keys_for_s ~ */
+        null, null, null, null, null, null, null, null, null, null, null, null, null,
        /* ~ more_keys_for_k */
        // U+0450: "ѐ" CYRILLIC SMALL LETTER IE WITH GRAVE
        /* more_keys_for_cyrillic_ie */ "\u0450",
@ -2434,20 +2427,32 @@ public final class KeyboardTextsTable {
    /* Language mn_MN: Mongolian (Mongolia) */
    private static final String[] LANGUAGE_mn_MN = {
        /* more_keys_for_a ~ */
-        null, null, null, null, null, null, null, null, null, null,
-        /* ~ more_keys_for_n */
+        null, null, null, null, null, null, null, null,
+        /* ~ more_keys_for_c */
        // Label for "switch to alphabetic" key.
        // U+0410: "А" CYRILLIC CAPITAL LETTER A
        // U+0411: "Б" CYRILLIC CAPITAL LETTER BE
        // U+0412: "В" CYRILLIC CAPITAL LETTER VE
        /* label_to_alpha_key */ "\u0410\u0411\u0412",
-        /* more_keys_for_y ~ */
-        null, null, null, null, null, null, null, null,
+        /* more_keys_for_s ~ */
+        null, null, null, null, null, null, null, null, null, null,
        /* ~ double_angle_quotes */
        // U+20AE: "₮" TUGRIK SIGN
        /* keylabel_for_currency */ "\u20AE",
    };

+    /* Language my_MM: Burmese (Myanmar) */
+    private static final String[] LANGUAGE_my_MM = {
+        /* more_keys_for_a ~ */
+        null, null, null, null, null, null, null, null,
+        /* ~ more_keys_for_c */
+        // Label for "switch to alphabetic" key.
+        // U+1000: "က" MYANMAR LETTER KA
+        // U+1001: "ခ" MYANMAR LETTER KHA
+        // U+1002: "ဂ" MYANMAR LETTER GA
+        /* label_to_alpha_key */ "\u1000\u1001\u1002",
+    };
+
    /* Language nb: Norwegian Bokmål */
    private static final String[] LANGUAGE_nb = {
        // U+00E0: "à" LATIN SMALL LETTER A WITH GRAVE
@ -2504,15 +2509,15 @@ public final class KeyboardTextsTable {
    /* Language ne_NP: Nepali (Nepal) */
    private static final String[] LANGUAGE_ne_NP = {
        /* more_keys_for_a ~ */
-        null, null, null, null, null, null, null, null, null, null,
-        /* ~ more_keys_for_n */
+        null, null, null, null, null, null, null, null,
+        /* ~ more_keys_for_c */
        // Label for "switch to alphabetic" key.
        // U+0915: "क" DEVANAGARI LETTER KA
        // U+0916: "ख" DEVANAGARI LETTER KHA
        // U+0917: "ग" DEVANAGARI LETTER GA
        /* label_to_alpha_key */ "\u0915\u0916\u0917",
-        /* more_keys_for_y ~ */
-        null, null, null, null, null, null, null, null,
+        /* more_keys_for_s ~ */
+        null, null, null, null, null, null, null, null, null, null,
        /* ~ double_angle_quotes */
        // U+0930/U+0941/U+002E "रु." NEPALESE RUPEE SIGN
        /* keylabel_for_currency */ "\u0930\u0941.",
@ -2600,12 +2605,12 @@ public final class KeyboardTextsTable {
        /* more_keys_for_i */ "\u00ED,\u00EF,\u00EC,\u00EE,\u012F,\u012B,\u0133",
        /* double_quotes */ "!text/double_9qm_rqm",
        /* single_quotes */ "!text/single_9qm_rqm",
-        /* more_keys_for_c */ null,
-        /* more_keys_for_s */ null,
+        /* more_keys_for_c ~ */
+        null, null, null,
+        /* ~ more_keys_for_s */
        // U+00F1: "ñ" LATIN SMALL LETTER N WITH TILDE
        // U+0144: "ń" LATIN SMALL LETTER N WITH ACUTE
        /* more_keys_for_n */ "\u00F1,\u0144",
-        /* label_to_alpha_key */ null,
        // U+0133: "ĳ" LATIN SMALL LIGATURE IJ
        /* more_keys_for_y */ "\u0133",
    };
@ -2647,6 +2652,7 @@ public final class KeyboardTextsTable {
        // U+00E7: "ç" LATIN SMALL LETTER C WITH CEDILLA
        // U+010D: "č" LATIN SMALL LETTER C WITH CARON
        /* more_keys_for_c */ "\u0107,\u00E7,\u010D",
+        /* label_to_alpha_key */ null,
        // U+015B: "ś" LATIN SMALL LETTER S WITH ACUTE
        // U+00DF: "ß" LATIN SMALL LETTER SHARP S
        // U+0161: "š" LATIN SMALL LETTER S WITH CARON
@ -2654,9 +2660,8 @@ public final class KeyboardTextsTable {
        // U+0144: "ń" LATIN SMALL LETTER N WITH ACUTE
        // U+00F1: "ñ" LATIN SMALL LETTER N WITH TILDE
        /* more_keys_for_n */ "\u0144,\u00F1",
-        /* label_to_alpha_key ~ */
-        null, null, null,
-        /* ~ more_keys_for_d */
+        /* more_keys_for_y */ null,
+        /* more_keys_for_d */ null,
        // U+017C: "ż" LATIN SMALL LETTER Z WITH DOT ABOVE
        // U+017A: "ź" LATIN SMALL LETTER Z WITH ACUTE
        // U+017E: "ž" LATIN SMALL LETTER Z WITH CARON
@ -2754,13 +2759,14 @@ public final class KeyboardTextsTable {
        /* double_quotes */ "!text/double_9qm_rqm",
        /* single_quotes */ "!text/single_9qm_rqm",
        /* more_keys_for_c */ null,
+        /* label_to_alpha_key */ null,
        // U+0219: "ș" LATIN SMALL LETTER S WITH COMMA BELOW
        // U+00DF: "ß" LATIN SMALL LETTER SHARP S
        // U+015B: "ś" LATIN SMALL LETTER S WITH ACUTE
        // U+0161: "š" LATIN SMALL LETTER S WITH CARON
        /* more_keys_for_s */ "\u0219,\u00DF,\u015B,\u0161",
        /* more_keys_for_n ~ */
-        null, null, null, null, null,
+        null, null, null, null,
        /* ~ more_keys_for_z */
        // U+021B: "ț" LATIN SMALL LETTER T WITH COMMA BELOW
        /* more_keys_for_t */ "\u021B",
@ -2773,16 +2779,14 @@ public final class KeyboardTextsTable {
        /* ~ more_keys_for_i */
        /* double_quotes */ "!text/double_9qm_lqm",
        /* single_quotes */ "!text/single_9qm_lqm",
-        /* more_keys_for_c ~ */
-        null, null, null,
-        /* ~ more_keys_for_n */
+        /* more_keys_for_c */ null,
        // Label for "switch to alphabetic" key.
        // U+0410: "А" CYRILLIC CAPITAL LETTER A
        // U+0411: "Б" CYRILLIC CAPITAL LETTER BE
        // U+0412: "В" CYRILLIC CAPITAL LETTER VE
        /* label_to_alpha_key */ "\u0410\u0411\u0412",
-        /* more_keys_for_y ~ */
-        null, null, null, null, null, null, null, null, null, null, null,
+        /* more_keys_for_s ~ */
+        null, null, null, null, null, null, null, null, null, null, null, null, null,
        /* ~ more_keys_for_k */
        // U+0451: "ё" CYRILLIC SMALL LETTER IO
        /* more_keys_for_cyrillic_ie */ "\u0451",
@ -2854,6 +2858,7 @@ public final class KeyboardTextsTable {
        // U+00E7: "ç" LATIN SMALL LETTER C WITH CEDILLA
        // U+0107: "ć" LATIN SMALL LETTER C WITH ACUTE
        /* more_keys_for_c */ "\u010D,\u00E7,\u0107",
+        /* label_to_alpha_key */ null,
        // U+0161: "š" LATIN SMALL LETTER S WITH CARON
        // U+00DF: "ß" LATIN SMALL LETTER SHARP S
        // U+015B: "ś" LATIN SMALL LETTER S WITH ACUTE
@ -2864,7 +2869,6 @@ public final class KeyboardTextsTable {
        // U+00F1: "ñ" LATIN SMALL LETTER N WITH TILDE
        // U+0144: "ń" LATIN SMALL LETTER N WITH ACUTE
        /* more_keys_for_n */ "\u0148,\u0146,\u00F1,\u0144",
-        /* label_to_alpha_key */ null,
        // U+00FD: "ý" LATIN SMALL LETTER Y WITH ACUTE
        // U+00FF: "ÿ" LATIN SMALL LETTER Y WITH DIAERESIS
        /* more_keys_for_y */ "\u00FD,\u00FF",
@ -2906,11 +2910,11 @@ public final class KeyboardTextsTable {
        // U+010D: "č" LATIN SMALL LETTER C WITH CARON
        // U+0107: "ć" LATIN SMALL LETTER C WITH ACUTE
        /* more_keys_for_c */ "\u010D,\u0107",
+        /* label_to_alpha_key */ null,
        // U+0161: "š" LATIN SMALL LETTER S WITH CARON
        /* more_keys_for_s */ "\u0161",
-        /* more_keys_for_n ~ */
-        null, null, null,
-        /* ~ more_keys_for_y */
+        /* more_keys_for_n */ null,
+        /* more_keys_for_y */ null,
        // U+0111: "đ" LATIN SMALL LETTER D WITH STROKE
        /* more_keys_for_d */ "\u0111",
        // U+017E: "ž" LATIN SMALL LETTER Z WITH CARON
@ -2929,17 +2933,15 @@ public final class KeyboardTextsTable {
        /* ~ more_keys_for_i */
        /* double_quotes */ "!text/double_9qm_lqm",
        /* single_quotes */ "!text/single_9qm_lqm",
-        /* more_keys_for_c ~ */
-        null, null, null,
-        /* ~ more_keys_for_n */
+        /* more_keys_for_c */ null,
        // END: More keys definitions for Serbian (Cyrillic)
        // Label for "switch to alphabetic" key.
        // U+0410: "А" CYRILLIC CAPITAL LETTER A
        // U+0411: "Б" CYRILLIC CAPITAL LETTER BE
        // U+0412: "В" CYRILLIC CAPITAL LETTER VE
        /* label_to_alpha_key */ "\u0410\u0411\u0412",
-        /* more_keys_for_y ~ */
-        null, null, null, null, null, null,
+        /* more_keys_for_s ~ */
+        null, null, null, null, null, null, null, null,
        /* ~ more_keys_for_g */
        /* single_angle_quotes */ "!text/single_raqm_laqm",
        /* double_angle_quotes */ "!text/double_raqm_laqm",
@ -3021,6 +3023,7 @@ public final class KeyboardTextsTable {
        // U+0107: "ć" LATIN SMALL LETTER C WITH ACUTE
        // U+010D: "č" LATIN SMALL LETTER C WITH CARON
        /* more_keys_for_c */ "\u00E7,\u0107,\u010D",
+        /* label_to_alpha_key */ null,
        // U+015B: "ś" LATIN SMALL LETTER S WITH ACUTE
        // U+0161: "š" LATIN SMALL LETTER S WITH CARON
        // U+015F: "ş" LATIN SMALL LETTER S WITH CEDILLA
@ -3030,7 +3033,6 @@ public final class KeyboardTextsTable {
        // U+00F1: "ñ" LATIN SMALL LETTER N WITH TILDE
        // U+0148: "ň" LATIN SMALL LETTER N WITH CARON
        /* more_keys_for_n */ "\u0144,\u00F1,\u0148",
-        /* label_to_alpha_key */ null,
        // U+00FD: "ý" LATIN SMALL LETTER Y WITH ACUTE
        // U+00FF: "ÿ" LATIN SMALL LETTER Y WITH DIAERESIS
        /* more_keys_for_y */ "\u00FD,\u00FF",
@ -3113,12 +3115,13 @@ public final class KeyboardTextsTable {
        /* single_quotes */ null,
        // U+00E7: "ç" LATIN SMALL LETTER C WITH CEDILLA
        /* more_keys_for_c */ "\u00E7",
+        /* label_to_alpha_key */ null,
        // U+00DF: "ß" LATIN SMALL LETTER SHARP S
        /* more_keys_for_s */ "\u00DF",
        // U+00F1: "ñ" LATIN SMALL LETTER N WITH TILDE
        /* more_keys_for_n */ "\u00F1",
-        /* label_to_alpha_key ~ */
-        null, null, null, null, null, null,
+        /* more_keys_for_y ~ */
+        null, null, null, null, null,
        /* ~ more_keys_for_l */
        /* more_keys_for_g */ "g\'",
    };
@ -3126,15 +3129,15 @@ public final class KeyboardTextsTable {
    /* Language th: Thai */
    private static final String[] LANGUAGE_th = {
        /* more_keys_for_a ~ */
-        null, null, null, null, null, null, null, null, null, null,
-        /* ~ more_keys_for_n */
+        null, null, null, null, null, null, null, null,
+        /* ~ more_keys_for_c */
        // Label for "switch to alphabetic" key.
        // U+0E01: "ก" THAI CHARACTER KO KAI
        // U+0E02: "ข" THAI CHARACTER KHO KHAI
        // U+0E04: "ค" THAI CHARACTER KHO KHWAI
        /* label_to_alpha_key */ "\u0E01\u0E02\u0E04",
-        /* more_keys_for_y ~ */
-        null, null, null, null, null, null, null, null,
+        /* more_keys_for_s ~ */
+        null, null, null, null, null, null, null, null, null, null,
        /* ~ double_angle_quotes */
        // U+0E3F: "฿" THAI CURRENCY SYMBOL BAHT
        /* keylabel_for_currency */ "\u0E3F",
@ -3190,6 +3193,7 @@ public final class KeyboardTextsTable {
        // U+0107: "ć" LATIN SMALL LETTER C WITH ACUTE
        // U+010D: "č" LATIN SMALL LETTER C WITH CARON
        /* more_keys_for_c */ "\u00E7,\u0107,\u010D",
+        /* label_to_alpha_key */ null,
        /* more_keys_for_s */ null,
        // U+00F1: "ñ" LATIN SMALL LETTER N WITH TILDE
        // U+0144: "ń" LATIN SMALL LETTER N WITH ACUTE
@ -3230,13 +3234,14 @@ public final class KeyboardTextsTable {
        // U+0107: "ć" LATIN SMALL LETTER C WITH ACUTE
        // U+010D: "č" LATIN SMALL LETTER C WITH CARON
        /* more_keys_for_c */ "\u00E7,\u0107,\u010D",
+        /* label_to_alpha_key */ null,
        // U+015F: "ş" LATIN SMALL LETTER S WITH CEDILLA
        // U+00DF: "ß" LATIN SMALL LETTER SHARP S
        // U+015B: "ś" LATIN SMALL LETTER S WITH ACUTE
        // U+0161: "š" LATIN SMALL LETTER S WITH CARON
        /* more_keys_for_s */ "\u015F,\u00DF,\u015B,\u0161",
        /* more_keys_for_n ~ */
-        null, null, null, null, null, null, null,
+        null, null, null, null, null, null,
        /* ~ more_keys_for_l */
        // U+011F: "ğ" LATIN SMALL LETTER G WITH BREVE
        /* more_keys_for_g */ "\u011F",
@ -3249,16 +3254,14 @@ public final class KeyboardTextsTable {
        /* ~ more_keys_for_i */
        /* double_quotes */ "!text/double_9qm_lqm",
        /* single_quotes */ "!text/single_9qm_lqm",
-        /* more_keys_for_c ~ */
-        null, null, null,
-        /* ~ more_keys_for_n */
+        /* more_keys_for_c */ null,
        // Label for "switch to alphabetic" key.
        // U+0410: "А" CYRILLIC CAPITAL LETTER A
        // U+0411: "Б" CYRILLIC CAPITAL LETTER BE
        // U+0412: "В" CYRILLIC CAPITAL LETTER VE
        /* label_to_alpha_key */ "\u0410\u0411\u0412",
-        /* more_keys_for_y ~ */
-        null, null, null, null, null, null, null, null,
+        /* more_keys_for_s ~ */
+        null, null, null, null, null, null, null, null, null, null,
        /* ~ double_angle_quotes */
        // U+20B4: "₴" HRYVNIA SIGN
        /* keylabel_for_currency */ "\u20B4",
@ -3357,7 +3360,7 @@ public final class KeyboardTextsTable {
        /* more_keys_for_i */ "\u00EC,\u00ED,\u1EC9,\u0129,\u1ECB",
        /* double_quotes ~ */
        null, null, null, null, null, null,
-        /* ~ label_to_alpha_key */
+        /* ~ more_keys_for_n */
        // U+1EF3: "ỳ" LATIN SMALL LETTER Y WITH GRAVE
        // U+00FD: "ý" LATIN SMALL LETTER Y WITH ACUTE
        // U+1EF7: "ỷ" LATIN SMALL LETTER Y WITH HOOK ABOVE
@ -3416,6 +3419,7 @@ public final class KeyboardTextsTable {
        /* single_quotes */ null,
        // U+00E7: "ç" LATIN SMALL LETTER C WITH CEDILLA
        /* more_keys_for_c */ "\u00E7",
+        /* label_to_alpha_key */ null,
        // U+00DF: "ß" LATIN SMALL LETTER SHARP S
        /* more_keys_for_s */ "\u00DF",
        // U+00F1: "ñ" LATIN SMALL LETTER N WITH TILDE
@ -3488,6 +3492,7 @@ public final class KeyboardTextsTable {
        // U+010B: "ċ" LATIN SMALL LETTER C WITH DOT ABOVE
        // U+010D: "č" LATIN SMALL LETTER C WITH CARON
        /* more_keys_for_c */ "\u00E7,\u0107,\u0109,\u010B,\u010D",
+        /* label_to_alpha_key */ null,
        // U+00DF: "ß" LATIN SMALL LETTER SHARP S
        // U+015B: "ś" LATIN SMALL LETTER S WITH ACUTE
        // U+015D: "ŝ" LATIN SMALL LETTER S WITH CIRCUMFLEX
@ -3502,7 +3507,6 @@ public final class KeyboardTextsTable {
        // U+0149: "ŉ" LATIN SMALL LETTER N PRECEDED BY APOSTROPHE
        // U+014B: "ŋ" LATIN SMALL LETTER ENG
        /* more_keys_for_n */ "\u00F1,\u0144,\u0146,\u0148,\u0149,\u014B",
-        /* label_to_alpha_key */ null,
        // U+00FD: "ý" LATIN SMALL LETTER Y WITH ACUTE
        // U+0177: "ŷ" LATIN SMALL LETTER Y WITH CIRCUMFLEX
        // U+00FF: "ÿ" LATIN SMALL LETTER Y WITH DIAERESIS
@ -3570,13 +3574,13 @@ public final class KeyboardTextsTable {
        "ar", LANGUAGE_ar,    /*  58/109 Arabic */
        "az", LANGUAGE_az_AZ, /*   8/ 17 Azerbaijani (Azerbaijan) */
        "be", LANGUAGE_be_BY, /*   9/ 32 Belarusian (Belarus) */
-        "bg", LANGUAGE_bg,    /*   2/ 11 Bulgarian */
+        "bg", LANGUAGE_bg,    /*   2/  9 Bulgarian */
        "ca", LANGUAGE_ca,    /*  11/116 Catalan */
        "cs", LANGUAGE_cs,    /*  17/ 21 Czech */
        "da", LANGUAGE_da,    /*  19/ 34 Danish */
        "de", LANGUAGE_de,    /*  16/ 92 German */
-        "el", LANGUAGE_el,    /*   1/ 11 Greek */
-        "en", LANGUAGE_en,    /*   8/ 10 English */
+        "el", LANGUAGE_el,    /*   1/  9 Greek */
+        "en", LANGUAGE_en,    /*   8/ 11 English */
        "eo", LANGUAGE_eo,    /*  26/128 Esperanto */
        "es", LANGUAGE_es,    /*   8/ 33 Spanish */
        "et", LANGUAGE_et_EE, /*  22/ 27 Estonian (Estonia) */
@ -3590,7 +3594,7 @@ public final class KeyboardTextsTable {
        "is", LANGUAGE_is,    /*  10/ 15 Icelandic */
        "it", LANGUAGE_it,    /*   5/  5 Italian */
        "iw", LANGUAGE_iw,    /*  20/117 Hebrew */
-        "ka", LANGUAGE_ka_GE, /*   3/ 11 Georgian (Georgia) */
+        "ka", LANGUAGE_ka_GE, /*   3/  9 Georgian (Georgia) */
        "kk", LANGUAGE_kk,    /*  15/114 Kazakh */
        "km", LANGUAGE_km_KH, /*   2/115 Khmer (Cambodia) */
        "ky", LANGUAGE_ky,    /*  10/ 81 Kirghiz */
@ -3599,6 +3603,7 @@ public final class KeyboardTextsTable {
        "lv", LANGUAGE_lv,    /*  18/ 22 Latvian */
        "mk", LANGUAGE_mk,    /*   9/ 86 Macedonian */
        "mn", LANGUAGE_mn_MN, /*   2/ 20 Mongolian (Mongolia) */
+        "my", LANGUAGE_my_MM, /*   1/  9 Burmese (Myanmar) */
        "nb", LANGUAGE_nb,    /*  11/ 34 Norwegian Bokmål */
        "ne", LANGUAGE_ne_NP, /*  24/ 56 Nepali (Nepal) */
        "nl", LANGUAGE_nl,    /*   9/ 12 Dutch */
@ -3613,11 +3618,11 @@ public final class KeyboardTextsTable {
        "sv", LANGUAGE_sv,    /*  21/ 34 Swedish */
        "sw", LANGUAGE_sw,    /*   9/ 17 Swahili */
        "th", LANGUAGE_th,    /*   2/ 20 Thai */
-        "tl", LANGUAGE_tl,    /*   7/ 10 Tagalog */
+        "tl", LANGUAGE_tl,    /*   7/ 11 Tagalog */
        "tr", LANGUAGE_tr,    /*   7/ 17 Turkish */
        "uk", LANGUAGE_uk,    /*  11/ 80 Ukrainian */
        "vi", LANGUAGE_vi,    /*   8/ 20 Vietnamese */
-        "zu", LANGUAGE_zu,    /*   8/ 10 Zulu */
+        "zu", LANGUAGE_zu,    /*   8/ 11 Zulu */
        "zz", LANGUAGE_zz,    /*  19/111 Alphabet */
    };

--- a/tools/make-keyboard-text/res/values-my-rMM/donottranslate-more-keys.xml
+++ b/tools/make-keyboard-text/res/values-my-rMM/donottranslate-more-keys.xml
@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+**
+** Copyright 2014, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+**     http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- Label for "switch to alphabetic" key.
+         U+1000: "က" MYANMAR LETTER KA
+         U+1001: "ခ" MYANMAR LETTER KHA
+         U+1002: "ဂ" MYANMAR LETTER GA -->
+    <string name="label_to_alpha_key">&#x1000;&#x1001;&#x1002;</string>
+</resources>