Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 977d052f authored by Tadashi G. Takaoka's avatar Tadashi G. Takaoka
Browse files

Revise myanmar keyboard layout 

Note that this keyboard layout is still a preliminary.

Bug: 7963632
Change-Id: I4c53b3359ea2c0dd8e2ce7db8ec916ab9340eec5
parent 4ba064b7

java/res/xml-sw600dp/rows_myanmar.xml

+6 −16
Original line number Diff line number Diff line
@@ -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>

    </Row>

    <include

        latin:keyboardLayout="@xml/row_qwerty4" />

java/res/xml/method.xml

+4 −2
Original line number Diff line number Diff line
@@ -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"

java/res/xml/rowkeys_myanmar1.xml

+26 −27
Original line number Diff line number Diff line
@@ -25,50 +25,49 @@ 
        <case

            latin:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted"

        >

            <!-- U+100E: "ဎ" MYANMAR LETTER DDHA -->

            <!-- U+1027: "ဧ" MYANMAR LETTER E -->

            <Key

                latin:keySpec="&#x100E;"

                latin:keySpec="&#x1027;"

                latin:keyLabelFlags="fontNormal" />

            <!-- U+100D: "ဍ" MYANMAR LETTER DDA -->

            <!-- U+104F: "၏" MYANMAR SYMBOL GENITIVE -->

            <Key

                latin:keySpec="&#x100D;"

                latin:keySpec="&#x104F;"

                latin:keyLabelFlags="fontNormal" />

            <!-- U+1052: "ၒ" MYANMAR LETTER VOCALIC R -->

            <!-- U+1024: "ဤ" MYANMAR LETTER II -->

            <Key

                latin:keySpec="&#x1052;"

                latin:keySpec="&#x1024;"

                latin:keyLabelFlags="fontNormal" />

            <!-- U+100B: "ဋ" MYANMAR LETTER TTA -->

            <!-- U+1023: "ဣ" MYANMAR LETTER I -->

            <Key

                latin:keySpec="&#x100B;"

                latin:keySpec="&#x1023;"

                latin:keyLabelFlags="fontNormal" />

            <!-- U+1053: "ၓ" MYANMAR LETTER VOCALIC RR -->

            <!-- U+104E: "၎" MYANMAR SYMBOL AFOREMENTIONED -->

            <Key

                latin:keySpec="&#x1053;"

                latin:keySpec="&#x104E;"

                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="&#x1054;"

                latin:keyLabelFlags="fontNormal" />

            <!-- U+1055: "ၕ" MYANMAR LETTER VOCALIC LL -->

            <Key

                latin:keySpec="&#x1055;"

                latin:keyLabelFlags="fontNormal" />

            <!-- U+101B: "ရ" MYANMAR LETTER RA -->

                latin:keySpec="&#x1000;&#x103B;&#x1015;&#x103A;"

                latin:keyLabelFlags="fontNormal|followKeyLetterRatio|autoScale" />

            <!-- U+1029: "ဩ" MYANMAR LETTER O -->

            <Key

                latin:keySpec="&#x101B;"

                latin:keyLabelFlags="fontNormal" />

                latin:keySpec="&#x1029;"

                latin:keyLabelFlags="fontNormal|autoScale" />

            <!-- U+102A: "ဪ" MYANMAR LETTER AU -->

            <Key

                latin:keySpec="*" />

                latin:keySpec="&#x102A;"

                latin:keyLabelFlags="fontNormal|autoScale" />

            <!-- U+104D: "၍" MYANMAR SYMBOL COMPLETED -->

            <Key

                latin:keySpec="(" />

                latin:keySpec="&#x104D;"

                latin:keyLabelFlags="fontNormal" />

            <!-- U+104C: "၌" MYANMAR SYMBOL LOCATIVE -->

            <Key

                latin:keySpec=")" />

                latin:keySpec="&#x104C;"

                latin:keyLabelFlags="fontNormal" />

        </case>

        <default>

            <!-- U+1050: "ၐ" MYANMAR LETTER SHA -->

            <Key

                latin:keySpec="&#x1050;"

                latin:keyLabelFlags="fontNormal" />

            <!-- U+1041: "၁" MYANMAR DIGIT ONE -->

            <Key

                latin:keySpec="&#x1041;"

java/res/xml/rowkeys_myanmar2.xml

+20 −28
Original line number Diff line number Diff line
@@ -25,49 +25,45 @@ 
        <case

            latin:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted"

        >

            <!-- U+1008: "ဈ" MYANMAR LETTER JHA -->

            <!-- U+1017: "ဗ" MYANMAR LETTER BA -->

            <Key

                latin:keySpec="&#x1008;"

                latin:keySpec="&#x1017;"

                latin:keyLabelFlags="fontNormal" />

            <!-- U+101D: "ဝ" MYANMAR LETTER WA -->

            <!-- U+1012: "ဒ" MYANMAR LETTER DA -->

            <Key

                latin:keySpec="&#x101D;"

                latin:keySpec="&#x1012;"

                latin:keyLabelFlags="fontNormal" />

            <!-- U+1023: "ဣ" MYANMAR LETTER I -->

            <!-- U+1013: "ဓ" MYANMAR LETTER DHA -->

            <Key

                latin:keySpec="&#x1023;"

                latin:keySpec="&#x1013;"

                latin:keyLabelFlags="fontNormal" />

            <!-- U+104E: "၎" MYANMAR SYMBOL AFOREMENTIONED -->

            <!-- U+1003: "ဃ" MYANMAR LETTER GHA -->

            <Key

                latin:keySpec="&#x104E;"

                latin:keySpec="&#x1003;"

                latin:keyLabelFlags="fontNormal" />

            <!-- U+1024: "ဤ" MYANMAR LETTER II -->

            <!-- U+100E: "ဎ" MYANMAR LETTER DDHA -->

            <Key

                latin:keySpec="&#x1024;"

                latin:keySpec="&#x100E;"

                latin:keyLabelFlags="fontNormal" />

            <!-- U+104C: "၌" MYANMAR SYMBOL LOCATIVE -->

            <!-- U+103F: "ဿ" MYANMAR LETTER GREAT SA -->

            <Key

                latin:keySpec="&#x104C;"

                latin:keySpec="&#x103F;"

                latin:keyLabelFlags="fontNormal" />

            <!-- U+1025: "ဥ" MYANMAR LETTER U -->

            <!-- U+100F: "ဏ" MYANMAR LETTER NNA -->

            <Key

                latin:keySpec="&#x1025;"

                latin:keySpec="&#x100F;"

                latin:keyLabelFlags="fontNormal" />

            <!-- U+104D: "၍" MYANMAR SYMBOL COMPLETED -->

            <!-- U+1008: "ဈ" MYANMAR LETTER JHA -->

            <Key

                latin:keySpec="&#x104D;"

                latin:keySpec="&#x1008;"

                latin:keyLabelFlags="fontNormal" />

            <!-- U+103F: "ဿ" MYANMAR LETTER GREAT SA -->

            <Key

                latin:keySpec="&#x103F;"

                latin:keyLabelFlags="fontNormal|autoXScale" />

            <!-- U+100F: "ဏ" MYANMAR LETTER NNA -->

            <!-- U+1007: "ဇ" MYANMAR LETTER JA -->

            <Key

                latin:keySpec="&#x100F;"

                latin:keySpec="&#x1007;"

                latin:keyLabelFlags="fontNormal" />

            <!-- U+1027: "ဧ" MYANMAR LETTER E -->

            <!-- U+1002: "ဂ" MYANMAR LETTER GA -->

            <Key

                latin:keySpec="&#x1027;"

                latin:keySpec="&#x1002;"

                latin:keyLabelFlags="fontNormal" />

        </case>

        <default>
@@ -111,10 +107,6 @@ 
            <Key

                latin:keySpec="&#x1005;"

                latin:keyLabelFlags="fontNormal" />

            <!-- U+101F: "ဟ" MYANMAR LETTER HA -->

            <Key

                latin:keySpec="&#x101F;"

                latin:keyLabelFlags="fontNormal" />

        </default>

    </switch>

</merge>

java/res/xml/rowkeys_myanmar3.xml

+43 −32
Original line number Diff line number Diff line
@@ -25,10 +25,18 @@ 
        <case

            latin:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted"

        >

            <!-- U+1017: "ဗ" MYANMAR LETTER BA -->

            <!-- U+101A: "ယ" MYANMAR LETTER YA -->

            <Key

                latin:keySpec="&#x1017;"

                latin:keySpec="&#x101A;"

                latin:keyLabelFlags="fontNormal" />

            <!-- U+1039: "္" MYANMAR SIGN VIRAMA -->

            <Key

                latin:keySpec="&#x1039;"

                latin:keyLabelFlags="fontNormal" />

            <!-- U+1004/U+103A/U+1039: "င်္င" MYANMAR LETTER NGA/MYANMAR SIGN ASAT/MYANMAR SIGN VIRAMA -->

            <Key

                latin:keySpec="&#x1004;&#x103A;&#x1039;"

                latin:keyLabelFlags="fontNormal|followKeyLetterRatio" />

            <!-- U+103E: "ှ" MYANMAR CONSONANT SIGN MEDIAL HA -->

            <Key

                latin:keySpec="&#x103E;"
@@ -37,33 +45,25 @@ 
            <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 -->

            <!-- U+1030: "ူ" MYANMAR VOWEL SIGN UU -->

            <Key

                latin:keySpec="&#x103D;"

                latin:keySpec="&#x1030;"

                latin:keyLabelFlags="fontNormal" />

            <!-- U+1036: "ံ" MYANMAR SIGN ANUSVARA -->

            <!-- U+102B: "ါ" MYANMAR VOWEL SIGN TALL AA -->

            <Key

                latin:keySpec="&#x1036;"

                latin:keySpec="&#x102B;"

                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 -->

            <!-- U+1036: "ံ" MYANMAR SIGN ANUSVARA -->

            <Key

                latin:keySpec="&#x1013;"

                latin:keySpec="&#x1036;"

                latin:keyLabelFlags="fontNormal" />

            <!-- U+1002: "ဂ" MYANMAR LETTER GA -->

            <!-- U+101F: "ဟ" MYANMAR LETTER HA -->

            <Key

                latin:keySpec="&#x1002;"

                latin:keySpec="&#x101F;"

                latin:keyLabelFlags="fontNormal" />

        </case>

        <default>
@@ -75,33 +75,44 @@ 
            <Key

                latin:keySpec="&#x103B;"

                latin:keyLabelFlags="fontNormal" />

            <!-- U+102D: "ိ" MYANMAR VOWEL SIGN I -->

            <!-- U+103C: "ြ" MYANMAR CONSONANT SIGN MEDIAL RA -->

            <Key

                latin:keySpec="&#x102D;"

                latin:keySpec="&#x103C;"

                latin:keyLabelFlags="fontNormal" />

            <!-- U+103A: "်" MYANMAR SIGN ASAT -->

            <!-- 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="&#x103A;"

                latin:keySpec="&#x103D;"

                latin:moreKeys="&#x103E;,&#x103D;&#x103E;"

                latin:keyLabelFlags="fontNormal" />

            <!-- U+102B: "ါ" MYANMAR VOWEL SIGN TALL AA -->

            <!-- U+102D: "ိ" MYANMAR VOWEL SIGN I

                 U+102E: "ီ" MYANMAR VOWEL SIGN II -->

            <Key

                latin:keySpec="&#x102B;"

                latin:keySpec="&#x102D;"

                latin:moreKeys="&#x102E;"

                latin:keyLabelFlags="fontNormal" />

            <!-- U+1037: "့" MYANMAR SIGN DOT BELOW -->

            <!-- U+102F: "ု" MYANMAR VOWEL SIGN U

                 U+1030: "ူ" MYANMAR VOWEL SIGN UU -->

            <Key

                latin:keySpec="&#x1037;"

                latin:keySpec="&#x102F;"

                latin:moreKeys="&#x1030;"

                latin:keyLabelFlags="fontNormal" />

            <!-- U+103C: "ြ" MYANMAR CONSONANT SIGN MEDIAL RA -->

            <!-- U+102C: "ာ" MYANMAR VOWEL SIGN AA -->

            <Key

                latin:keySpec="&#x103C;"

                latin:keySpec="&#x102C;"

                latin:keyLabelFlags="fontNormal" />

            <!-- U+102F: "ု" MYANMAR VOWEL SIGN U -->

            <!-- U+103A: "်" MYANMAR SIGN ASAT

                 U+1032: "ဲ" MYANMAR VOWEL SIGN AI -->

            <Key

                latin:keySpec="&#x102F;"

                latin:keySpec="&#x103A;"

                latin:moreKeys="&#x1032;"

                latin:keyLabelFlags="fontNormal" />

            <!-- U+1030: "ူ" MYANMAR VOWEL SIGN UU -->

            <!-- U+1037: "့" MYANMAR SIGN DOT BELOW

                 U+1036: "ံ" MYANMAR SIGN ANUSVARA -->

            <Key

                latin:keySpec="&#x1030;"

                latin:keySpec="&#x1037;"

                latin:moreKeys="&#x1036;"

                latin:keyLabelFlags="fontNormal" />

            <!-- U+1038: "း" MYANMAR SIGN VISARGA -->

            <Key