Revise myanmar keyboard layout
Note that this keyboard layout is still a preliminary.
Bug: 7963632
Change-Id: I4c53b3359ea2c0dd8e2ce7db8ec916ab9340eec5
diff --git a/java/res/xml-sw600dp/rows_myanmar.xml b/java/res/xml-sw600dp/rows_myanmar.xml
index 778b330..8eedf9d 100644
--- a/java/res/xml-sw600dp/rows_myanmar.xml
+++ b/java/res/xml-sw600dp/rows_myanmar.xml
@@ -24,7 +24,7 @@
<include
latin:keyboardLayout="@xml/key_styles_common" />
<Row
- latin:keyWidth="8.1818%p"
+ latin:keyWidth="9.0%p"
>
<include
latin:keyboardLayout="@xml/rowkeys_myanmar1" />
@@ -33,40 +33,30 @@
latin:keyWidth="fillRight" />
</Row>
<Row
- latin:keyWidth="8.1818%p"
+ latin:keyWidth="9.0%p"
>
<include
latin:keyboardLayout="@xml/rowkeys_myanmar2" />
</Row>
<Row
- latin:keyWidth="8.1818%p"
+ latin:keyWidth="9.0%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"
+ latin:keyWidth="9.0%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>
+ <include
+ latin:keyboardLayout="@xml/keys_exclamation_question" />
</Row>
<include
latin:keyboardLayout="@xml/row_qwerty4" />
diff --git a/java/res/xml/method.xml b/java/res/xml/method.xml
index 594378f..28eceb8 100644
--- a/java/res/xml/method.xml
+++ b/java/res/xml/method.xml
@@ -329,6 +329,8 @@
android:imeSubtypeExtraValue="KeyboardLayoutSet=hindi,EmojiCapable"
android:isAsciiCapable="false"
/>
+ <!-- TODO: This hindi_compact 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_compact"
android:subtypeId="0xe49c89a1"
@@ -475,8 +477,6 @@
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"
@@ -485,6 +485,8 @@
android:imeSubtypeExtraValue="KeyboardLayoutSet=qwerty,AsciiCapable,EmojiCapable"
android:isAsciiCapable="true"
/>
+ <!-- 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="0xea266ea4"
diff --git a/java/res/xml/rowkeys_myanmar1.xml b/java/res/xml/rowkeys_myanmar1.xml
index 6460af5..b7c8209 100644
--- a/java/res/xml/rowkeys_myanmar1.xml
+++ b/java/res/xml/rowkeys_myanmar1.xml
@@ -25,50 +25,49 @@
<case
latin:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted"
>
- <!-- U+100E: "ဎ" MYANMAR LETTER DDHA -->
+ <!-- U+1027: "ဧ" MYANMAR LETTER E -->
<Key
- latin:keySpec="ဎ"
+ latin:keySpec="ဧ"
latin:keyLabelFlags="fontNormal" />
- <!-- U+100D: "ဍ" MYANMAR LETTER DDA -->
+ <!-- U+104F: "၏" MYANMAR SYMBOL GENITIVE -->
<Key
- latin:keySpec="ဍ"
+ latin:keySpec="၏"
latin:keyLabelFlags="fontNormal" />
- <!-- U+1052: "ၒ" MYANMAR LETTER VOCALIC R -->
+ <!-- U+1024: "ဤ" MYANMAR LETTER II -->
<Key
- latin:keySpec="ၒ"
+ latin:keySpec="ဤ"
latin:keyLabelFlags="fontNormal" />
- <!-- U+100B: "ဋ" MYANMAR LETTER TTA -->
+ <!-- U+1023: "ဣ" MYANMAR LETTER I -->
<Key
- latin:keySpec="ဋ"
+ latin:keySpec="ဣ"
latin:keyLabelFlags="fontNormal" />
- <!-- U+1053: "ၓ" MYANMAR LETTER VOCALIC RR -->
+ <!-- U+104E: "၎" MYANMAR SYMBOL AFOREMENTIONED -->
<Key
- latin:keySpec="ၓ"
+ latin:keySpec="၎"
latin:keyLabelFlags="fontNormal" />
- <!-- U+1054: "ၔ" MYANMAR LETTER VOCALIC L -->
+ <!-- U+1000/U+103B/U+1015/U+103A: "ကျပ်"
+ MYANMAR LETTER KA/MYANMAR CONSONANT SIGN MEDIAL YA/MYANMAR LETTER PA/MYANMAR SIGN ASAT -->
<Key
- latin:keySpec="ၔ"
+ latin:keySpec="ကျပ်"
+ latin:keyLabelFlags="fontNormal|followKeyLetterRatio|autoScale" />
+ <!-- U+1029: "ဩ" MYANMAR LETTER O -->
+ <Key
+ latin:keySpec="ဩ"
+ latin:keyLabelFlags="fontNormal|autoScale" />
+ <!-- U+102A: "ဪ" MYANMAR LETTER AU -->
+ <Key
+ latin:keySpec="ဪ"
+ latin:keyLabelFlags="fontNormal|autoScale" />
+ <!-- U+104D: "၍" MYANMAR SYMBOL COMPLETED -->
+ <Key
+ latin:keySpec="၍"
latin:keyLabelFlags="fontNormal" />
- <!-- U+1055: "ၕ" MYANMAR LETTER VOCALIC LL -->
+ <!-- U+104C: "၌" MYANMAR SYMBOL LOCATIVE -->
<Key
- latin:keySpec="ၕ"
+ latin:keySpec="၌"
latin:keyLabelFlags="fontNormal" />
- <!-- U+101B: "ရ" MYANMAR LETTER RA -->
- <Key
- latin:keySpec="ရ"
- latin:keyLabelFlags="fontNormal" />
- <Key
- latin:keySpec="*" />
- <Key
- latin:keySpec="(" />
- <Key
- latin:keySpec=")" />
</case>
<default>
- <!-- U+1050: "ၐ" MYANMAR LETTER SHA -->
- <Key
- latin:keySpec="ၐ"
- latin:keyLabelFlags="fontNormal" />
<!-- U+1041: "၁" MYANMAR DIGIT ONE -->
<Key
latin:keySpec="၁"
diff --git a/java/res/xml/rowkeys_myanmar2.xml b/java/res/xml/rowkeys_myanmar2.xml
index 558c38d..5f0115f 100644
--- a/java/res/xml/rowkeys_myanmar2.xml
+++ b/java/res/xml/rowkeys_myanmar2.xml
@@ -25,49 +25,45 @@
<case
latin:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted"
>
- <!-- U+1008: "ဈ" MYANMAR LETTER JHA -->
+ <!-- U+1017: "ဗ" MYANMAR LETTER BA -->
<Key
- latin:keySpec="ဈ"
+ latin:keySpec="ဗ"
latin:keyLabelFlags="fontNormal" />
- <!-- U+101D: "ဝ" MYANMAR LETTER WA -->
+ <!-- U+1012: "ဒ" MYANMAR LETTER DA -->
<Key
- latin:keySpec="ဝ"
+ latin:keySpec="ဒ"
latin:keyLabelFlags="fontNormal" />
- <!-- U+1023: "ဣ" MYANMAR LETTER I -->
+ <!-- U+1013: "ဓ" MYANMAR LETTER DHA -->
<Key
- latin:keySpec="ဣ"
+ latin:keySpec="ဓ"
latin:keyLabelFlags="fontNormal" />
- <!-- U+104E: "၎" MYANMAR SYMBOL AFOREMENTIONED -->
+ <!-- U+1003: "ဃ" MYANMAR LETTER GHA -->
<Key
- latin:keySpec="၎"
+ latin:keySpec="ဃ"
latin:keyLabelFlags="fontNormal" />
- <!-- U+1024: "ဤ" MYANMAR LETTER II -->
+ <!-- U+100E: "ဎ" MYANMAR LETTER DDHA -->
<Key
- latin:keySpec="ဤ"
- latin:keyLabelFlags="fontNormal" />
- <!-- U+104C: "၌" MYANMAR SYMBOL LOCATIVE -->
- <Key
- latin:keySpec="၌"
- latin:keyLabelFlags="fontNormal" />
- <!-- U+1025: "ဥ" MYANMAR LETTER U -->
- <Key
- latin:keySpec="ဥ"
- latin:keyLabelFlags="fontNormal" />
- <!-- U+104D: "၍" MYANMAR SYMBOL COMPLETED -->
- <Key
- latin:keySpec="၍"
+ latin:keySpec="ဎ"
latin:keyLabelFlags="fontNormal" />
<!-- U+103F: "ဿ" MYANMAR LETTER GREAT SA -->
<Key
latin:keySpec="ဿ"
- latin:keyLabelFlags="fontNormal|autoXScale" />
+ latin:keyLabelFlags="fontNormal" />
<!-- U+100F: "ဏ" MYANMAR LETTER NNA -->
<Key
latin:keySpec="ဏ"
latin:keyLabelFlags="fontNormal" />
- <!-- U+1027: "ဧ" MYANMAR LETTER E -->
+ <!-- U+1008: "ဈ" MYANMAR LETTER JHA -->
<Key
- latin:keySpec="ဧ"
+ latin:keySpec="ဈ"
+ latin:keyLabelFlags="fontNormal" />
+ <!-- U+1007: "ဇ" MYANMAR LETTER JA -->
+ <Key
+ latin:keySpec="ဇ"
+ latin:keyLabelFlags="fontNormal" />
+ <!-- U+1002: "ဂ" MYANMAR LETTER GA -->
+ <Key
+ latin:keySpec="ဂ"
latin:keyLabelFlags="fontNormal" />
</case>
<default>
@@ -111,10 +107,6 @@
<Key
latin:keySpec="စ"
latin:keyLabelFlags="fontNormal" />
- <!-- U+101F: "ဟ" MYANMAR LETTER HA -->
- <Key
- latin:keySpec="ဟ"
- latin:keyLabelFlags="fontNormal" />
</default>
</switch>
</merge>
diff --git a/java/res/xml/rowkeys_myanmar3.xml b/java/res/xml/rowkeys_myanmar3.xml
index 2d0d48c..612bcd3 100644
--- a/java/res/xml/rowkeys_myanmar3.xml
+++ b/java/res/xml/rowkeys_myanmar3.xml
@@ -25,10 +25,18 @@
<case
latin:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted"
>
- <!-- U+1017: "ဗ" MYANMAR LETTER BA -->
+ <!-- U+101A: "ယ" MYANMAR LETTER YA -->
<Key
- latin:keySpec="ဗ"
+ latin:keySpec="ယ"
latin:keyLabelFlags="fontNormal" />
+ <!-- U+1039: "္" MYANMAR SIGN VIRAMA -->
+ <Key
+ latin:keySpec="္"
+ latin:keyLabelFlags="fontNormal" />
+ <!-- U+1004/U+103A/U+1039: "င်္င" MYANMAR LETTER NGA/MYANMAR SIGN ASAT/MYANMAR SIGN VIRAMA -->
+ <Key
+ latin:keySpec="င်္"
+ latin:keyLabelFlags="fontNormal|followKeyLetterRatio" />
<!-- U+103E: "ှ" MYANMAR CONSONANT SIGN MEDIAL HA -->
<Key
latin:keySpec="ှ"
@@ -37,33 +45,25 @@
<Key
latin:keySpec="ီ"
latin:keyLabelFlags="fontNormal" />
- <!-- U+1039: "္" MYANMAR SIGN VIRAMA -->
+ <!-- U+1030: "ူ" MYANMAR VOWEL SIGN UU -->
<Key
- latin:keySpec="္"
+ latin:keySpec="ူ"
latin:keyLabelFlags="fontNormal" />
- <!-- U+103D: "ွ" MYANMAR CONSONANT SIGN MEDIAL WA -->
+ <!-- U+102B: "ါ" MYANMAR VOWEL SIGN TALL AA -->
<Key
- latin:keySpec="ွ"
- latin:keyLabelFlags="fontNormal" />
- <!-- U+1036: "ံ" MYANMAR SIGN ANUSVARA -->
- <Key
- latin:keySpec="ံ"
+ latin:keySpec="ါ"
latin:keyLabelFlags="fontNormal" />
<!-- U+1032: "ဲ" MYANMAR VOWEL SIGN AI -->
<Key
latin:keySpec="ဲ"
latin:keyLabelFlags="fontNormal" />
- <!-- U+1012: "ဒ" MYANMAR LETTER DA -->
+ <!-- U+1036: "ံ" MYANMAR SIGN ANUSVARA -->
<Key
- latin:keySpec="ဒ"
+ latin:keySpec="ံ"
latin:keyLabelFlags="fontNormal" />
- <!-- U+1013: "ဓ" MYANMAR LETTER DHA -->
+ <!-- U+101F: "ဟ" MYANMAR LETTER HA -->
<Key
- latin:keySpec="ဓ"
- latin:keyLabelFlags="fontNormal" />
- <!-- U+1002: "ဂ" MYANMAR LETTER GA -->
- <Key
- latin:keySpec="ဂ"
+ latin:keySpec="ဟ"
latin:keyLabelFlags="fontNormal" />
</case>
<default>
@@ -75,33 +75,44 @@
<Key
latin:keySpec="ျ"
latin:keyLabelFlags="fontNormal" />
- <!-- U+102D: "ိ" MYANMAR VOWEL SIGN I -->
- <Key
- latin:keySpec="ိ"
- latin:keyLabelFlags="fontNormal" />
- <!-- U+103A: "်" MYANMAR SIGN ASAT -->
- <Key
- latin:keySpec="်"
- latin:keyLabelFlags="fontNormal" />
- <!-- U+102B: "ါ" MYANMAR VOWEL SIGN TALL AA -->
- <Key
- latin:keySpec="ါ"
- latin:keyLabelFlags="fontNormal" />
- <!-- U+1037: "့" MYANMAR SIGN DOT BELOW -->
- <Key
- latin:keySpec="့"
- latin:keyLabelFlags="fontNormal" />
<!-- U+103C: "ြ" MYANMAR CONSONANT SIGN MEDIAL RA -->
<Key
latin:keySpec="ြ"
latin:keyLabelFlags="fontNormal" />
- <!-- U+102F: "ု" MYANMAR VOWEL SIGN U -->
+ <!-- U+103D: "ွ" MYANMAR CONSONANT SIGN MEDIAL WA
+ U+103E: "ှ" MYANMAR CONSONANT SIGN MEDIAL HA
+ U+103D/U+103E: "ွှ" MYANMAR CONSONANT SIGN MEDIAL WA/MYANMAR CONSONANT SIGN MEDIAL HA -->
+ <Key
+ latin:keySpec="ွ"
+ latin:moreKeys="ှ,ွှ"
+ latin:keyLabelFlags="fontNormal" />
+ <!-- U+102D: "ိ" MYANMAR VOWEL SIGN I
+ U+102E: "ီ" MYANMAR VOWEL SIGN II -->
+ <Key
+ latin:keySpec="ိ"
+ latin:moreKeys="ီ"
+ latin:keyLabelFlags="fontNormal" />
+ <!-- U+102F: "ု" MYANMAR VOWEL SIGN U
+ U+1030: "ူ" MYANMAR VOWEL SIGN UU -->
<Key
latin:keySpec="ု"
+ latin:moreKeys="ူ"
latin:keyLabelFlags="fontNormal" />
- <!-- U+1030: "ူ" MYANMAR VOWEL SIGN UU -->
+ <!-- U+102C: "ာ" MYANMAR VOWEL SIGN AA -->
<Key
- latin:keySpec="ူ"
+ latin:keySpec="ာ"
+ latin:keyLabelFlags="fontNormal" />
+ <!-- U+103A: "်" MYANMAR SIGN ASAT
+ U+1032: "ဲ" MYANMAR VOWEL SIGN AI -->
+ <Key
+ latin:keySpec="်"
+ latin:moreKeys="ဲ"
+ latin:keyLabelFlags="fontNormal" />
+ <!-- U+1037: "့" MYANMAR SIGN DOT BELOW
+ U+1036: "ံ" MYANMAR SIGN ANUSVARA -->
+ <Key
+ latin:keySpec="့"
+ latin:moreKeys="ံ"
latin:keyLabelFlags="fontNormal" />
<!-- U+1038: "း" MYANMAR SIGN VISARGA -->
<Key
diff --git a/java/res/xml/rowkeys_myanmar4.xml b/java/res/xml/rowkeys_myanmar4.xml
index cfd1112..57466c5 100644
--- a/java/res/xml/rowkeys_myanmar4.xml
+++ b/java/res/xml/rowkeys_myanmar4.xml
@@ -25,42 +25,40 @@
<case
latin:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted"
>
- <!-- U+1007: "ဇ" MYANMAR LETTER JA -->
+ <!-- U+1025: "ဥ" MYANMAR LETTER U -->
<Key
- latin:keySpec="ဇ"
- latin:keyLabelFlags="fontNormal" />
- <!-- U+100C: "ဌ" MYANMAR LETTER TTHA -->
- <Key
- latin:keySpec="ဌ"
- latin:keyLabelFlags="fontNormal" />
- <!-- U+1003: "ဃ" MYANMAR LETTER GHA -->
- <Key
- latin:keySpec="ဃ"
- latin:keyLabelFlags="fontNormal" />
- <!-- U+1020: "ဠ" MYANMAR LETTER LLA -->
- <Key
- latin:keySpec="ဠ"
- latin:keyLabelFlags="fontNormal" />
- <!-- U+101A: "ယ" MYANMAR LETTER YA -->
- <Key
- latin:keySpec="ယ"
- latin:keyLabelFlags="fontNormal" />
- <!-- U+1009: "ဉ" MYANMAR LETTER NYA -->
- <Key
- latin:keySpec="ဉ"
+ latin:keySpec="ဥ"
latin:keyLabelFlags="fontNormal" />
<!-- U+1026: "ဦ" MYANMAR LETTER UU -->
<Key
latin:keySpec="ဦ"
latin:keyLabelFlags="fontNormal" />
- <!-- U+102A: "ဪ" MYANMAR LETTER AU -->
+ <!-- U+100C: "ဌ" MYANMAR LETTER TTHA -->
<Key
- latin:keySpec="ဪ"
- latin:keyLabelFlags="fontNormal|autoXScale" />
- <!-- U+1051: "ၑ" MYANMAR LETTER SSA -->
- <Key
- latin:keySpec="ၑ"
+ latin:keySpec="ဌ"
latin:keyLabelFlags="fontNormal" />
+ <!-- U+100B: "ဋ" MYANMAR LETTER TTA -->
+ <Key
+ latin:keySpec="ဋ"
+ latin:keyLabelFlags="fontNormal" />
+ <!-- U+100D: "ဍ" MYANMAR LETTER DDA -->
+ <Key
+ latin:keySpec="ဍ"
+ latin:keyLabelFlags="fontNormal" />
+ <!-- U+1020: "ဠ" MYANMAR LETTER LLA -->
+ <Key
+ latin:keySpec="ဠ"
+ latin:keyLabelFlags="fontNormal" />
+ <!-- U+100B/U+1039/U+100C: "ဋ္ဌ" MYANMAR LETTER TTA/MYANMAR SIGN VIRAMA/MYANMAR LETTER TTHA -->
+ <Key
+ latin:keySpec="ဋ္ဌ"
+ latin:keyLabelFlags="fontNormal|followKeyLetterRatio" />
+ <!-- U+100F/U+1039/U+100D: "ဏ္ဍ" MYANMAR LETTER NNA/MYANMAR SIGN VIRAMA/MYANMAR LETTER DDA
+ U+100F/U+1039/U+100C: "ဏ္ဌ" MYANMAR LETTER NNA/MYANMAR SIGN VIRAMA/MYANMAR LETTER TTHA -->
+ <Key
+ latin:keySpec="ဏ္ဍ"
+ latin:moreKeys="ဏ္ဌ"
+ latin:keyLabelFlags="fontNormal|followKeyLetterRatio" />
</case>
<default>
<!-- U+1016: "ဖ" MYANMAR LETTER PHA -->
@@ -83,21 +81,19 @@
<Key
latin:keySpec="ဘ"
latin:keyLabelFlags="fontNormal" />
- <!-- U+100A: "ည" MYANMAR LETTER NNYA -->
+ <!-- U+100A: "ည" MYANMAR LETTER NNYA
+ U+1009: "ဉ" MYANMAR LETTER NYA -->
<Key
latin:keySpec="ည"
+ latin:moreKeys="ဉ"
latin:keyLabelFlags="fontNormal" />
- <!-- U+102C: "ာ" MYANMAR VOWEL SIGN AA -->
+ <!-- U+101B: "ရ" MYANMAR LETTER RA -->
<Key
- latin:keySpec="ာ"
+ latin:keySpec="ရ"
latin:keyLabelFlags="fontNormal" />
- <!-- U+1029: "ဩ" MYANMAR LETTER O -->
+ <!-- U+101D: "ဝ" MYANMAR LETTER WA -->
<Key
- latin:keySpec="ဩ"
- latin:keyLabelFlags="fontNormal" />
- <!-- U+104F: "၏" MYANMAR SYMBOL GENITIVE -->
- <Key
- latin:keySpec="၏"
+ latin:keySpec="ဝ"
latin:keyLabelFlags="fontNormal" />
</default>
</switch>
diff --git a/java/res/xml/rows_myanmar.xml b/java/res/xml/rows_myanmar.xml
index 32c923d..5de47f7 100644
--- a/java/res/xml/rows_myanmar.xml
+++ b/java/res/xml/rows_myanmar.xml
@@ -24,26 +24,25 @@
<include
latin:keyboardLayout="@xml/key_styles_common" />
<Row
- latin:keyWidth="9.0909%p"
+ latin:keyWidth="10.0%p"
>
<include
latin:keyboardLayout="@xml/rowkeys_myanmar1" />
</Row>
<Row
- latin:keyWidth="9.0909%p"
+ latin:keyWidth="10.0%p"
>
<include
latin:keyboardLayout="@xml/rowkeys_myanmar2" />
</Row>
<Row
- latin:keyWidth="9.0909%p"
+ latin:keyWidth="10.0%p"
>
<include
- latin:keyXPos="4.5454%p"
latin:keyboardLayout="@xml/rowkeys_myanmar3" />
</Row>
<Row
- latin:keyWidth="9.0909%p"
+ latin:keyWidth="10.0%p"
>
<Key
latin:keyStyle="shiftKeyStyle" />