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

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

Use 5-row layout for Thai phone keybopard 

Bug: 6911182
Change-Id: I78f59564e8c31b9b66ed9a136584d0c57cc43120
parent 8624a0a1

java/res/xml-sw600dp/kbd_thai.xml

deleted100644 → 0
+0 −31
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

/*

**

** Copyright 2012, 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/key_bottom_gap_5row"

    latin:keyLetterSize="@fraction/key_letter_ratio_5row"

    latin:keyShiftedLetterHintRatio="@fraction/key_uppercase_letter_ratio_5row"

    latin:touchPositionCorrectionData="@null"

>

    <include

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

</Keyboard>

java/res/xml-sw600dp/rowkeys_thai1.xml

deleted100644 → 0
+0 −130
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

/*

**

** Copyright 2012, 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+0E51: "๑" THAI DIGIT ONE -->

            <Key

                latin:keyLabel="&#x0E51;"

                latin:keyLabelFlags="fontNormal" />

            <!-- U+0E52: "๒" THAI DIGIT TWO -->

            <Key

                latin:keyLabel="&#x0E52;"

                latin:keyLabelFlags="fontNormal" />

            <!-- U+0E53: "๓" THAI DIGIT THREE -->

            <Key

                latin:keyLabel="&#x0E53;"

                latin:keyLabelFlags="fontNormal" />

            <!-- U+0E54: "๔" THAI DIGIT FOUR -->

            <Key

                latin:keyLabel="&#x0E54;"

                latin:keyLabelFlags="fontNormal" />

            <!-- U+0020: " " SPACE

                 U+0E39: " ู" THAI CHARACTER SARA UU -->

            <!-- Note: The space character is needed as a preceding letter to draw some Thai

                 composing characters correctly. -->

            <Key

                latin:keyLabel="&#x20;&#x0E39;"

                latin:code="0x0E39"

                latin:keyLabelFlags="fontNormal|followKeyLetterRatio" />

            <!-- U+0E3F: "฿" THAI CURRENCY SYMBOL BAHT -->

            <Key

                latin:keyLabel="&#x0E3F;"

                latin:keyLabelFlags="fontNormal" />

            <!-- U+0E55: "๕" THAI DIGIT FIVE -->

            <Key

                latin:keyLabel="&#x0E55;"

                latin:keyLabelFlags="fontNormal" />

            <!-- U+0E56: "๖" THAI DIGIT SIX -->

            <Key

                latin:keyLabel="&#x0E56;"

                latin:keyLabelFlags="fontNormal" />

            <!-- U+0E57: "๗" THAI DIGIT SEVEN -->

            <Key

                latin:keyLabel="&#x0E57;"

                latin:keyLabelFlags="fontNormal" />

            <!-- U+0E58: "๘" THAI DIGIT EIGHT -->

            <Key

                latin:keyLabel="&#x0E58;"

                latin:keyLabelFlags="fontNormal" />

            <!-- U+0E59: "๙" THAI DIGIT NINE -->

            <Key

                latin:keyLabel="&#x0E59;"

                latin:keyLabelFlags="fontNormal" />

        </case>

        <default>

            <!-- U+0E45: "ๅ" THAI CHARACTER LAKKHANGYAO -->

            <Key

                latin:keyLabel="&#x0E45;"

                latin:keyLabelFlags="fontNormal" />

            <Key

                latin:keyLabel="/" />

            <!-- U+0E20: "ภ" THAI CHARACTER PHO SAMPHAO -->

            <Key

                latin:keyLabel="&#x0E20;"

                latin:keyLabelFlags="fontNormal" />

            <!-- U+0E16: "ถ" THAI CHARACTER THO THUNG -->

            <Key

                latin:keyLabel="&#x0E16;"

                latin:keyLabelFlags="fontNormal" />

            <!-- U+0020: " " SPACE

                 U+0E38: " ุ" THAI CHARACTER SARA U -->

            <!-- Note: The space character is needed as a preceding letter to draw some Thai

                 composing characters correctly. -->

            <Key

                latin:keyLabel="&#x20;&#x0E38;"

                latin:code="0x0E38"

                latin:keyLabelFlags="fontNormal|followKeyLetterRatio" />

            <!-- U+0020: " " SPACE

                 U+0E36: " ึ" THAI CHARACTER SARA UE -->

            <!-- Note: The space character is needed as a preceding letter to draw some Thai

                 composing characters correctly. -->

            <Key

                latin:keyLabel="&#x20;&#x0E36;"

                latin:code="0x0E36"

                latin:keyLabelFlags="fontNormal|followKeyLetterRatio" />

            <!-- U+0E04: "ค" THAI CHARACTER KHO KHWAI -->

            <Key

                latin:keyLabel="&#x0E04;"

                latin:keyLabelFlags="fontNormal" />

            <!-- U+0E15: "ต" THAI CHARACTER TO TAO -->

            <Key

                latin:keyLabel="&#x0E15;"

                latin:keyLabelFlags="fontNormal" />

            <!-- U+0E08: "จ" THAI CHARACTER CHO CHAN -->

            <Key

                latin:keyLabel="&#x0E08;"

                latin:keyLabelFlags="fontNormal" />

            <!-- U+0E02: "ข" THAI CHARACTER KHO KHAI -->

            <Key

                latin:keyLabel="&#x0E02;"

                latin:keyLabelFlags="fontNormal" />

            <!-- U+0E0A: "ช" THAI CHARACTER CHO CHANG -->

            <Key

                latin:keyLabel="&#x0E0A;"

                latin:keyLabelFlags="fontNormal" />

        </default>

    </switch>

</merge>

java/res/xml-sw600dp/rowkeys_thai2.xml

deleted100644 → 0
+0 −148
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

/*

**

** Copyright 2012, 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+0E50: "๐" THAI DIGIT ZERO -->

            <Key

                latin:keyLabel="&#x0E50;"

                latin:keyLabelFlags="fontNormal" />

            <Key

                latin:keyLabel="&quot;" />

            <!-- U+0E0E: "ฎ" THAI CHARACTER DO CHADA -->

            <Key

                latin:keyLabel="&#x0E0E;"

                latin:keyLabelFlags="fontNormal" />

            <!-- U+0E11: "ฑ" THAI CHARACTER THO NANGMONTHO -->

            <Key

                latin:keyLabel="&#x0E11;"

                latin:keyLabelFlags="fontNormal" />

            <!-- U+0E18: "ธ" THAI CHARACTER THO THONG -->

            <Key

                latin:keyLabel="&#x0E18;"

                latin:keyLabelFlags="fontNormal" />

            <!-- U+0020: " " SPACE

                 U+0E4D: " ํ" THAI CHARACTER THANTHAKHAT -->

            <!-- Note: The space character is needed as a preceding letter to draw some Thai

                 composing characters correctly. -->

            <Key

                latin:keyLabel="&#x20;&#x0E4D;"

                latin:code="0x0E4D"

                latin:keyLabelFlags="fontNormal|followKeyLetterRatio" />

            <!-- U+0020: " " SPACE

                 U+0E4A: " ๊" THAI CHARACTER MAI TRI -->

            <!-- Note: The space character is needed as a preceding letter to draw some Thai

                 composing characters correctly. -->

            <Key

                latin:keyLabel="&#x20;&#x0E4A;"

                latin:code="0x0E4A"

                latin:keyLabelFlags="fontNormal|followKeyLetterRatio" />

            <!-- U+0E13: "ณ" THAI CHARACTER NO NEN -->

            <Key

                latin:keyLabel="&#x0E13;"

                latin:keyLabelFlags="fontNormal" />

            <!-- U+0E2F: "ฯ" THAI CHARACTER PAIYANNOI -->

            <Key

                latin:keyLabel="&#x0E2F;"

                latin:keyLabelFlags="fontNormal" />

            <!-- U+0E0D: "ญ" THAI CHARACTER YO YING -->

            <Key

                latin:keyLabel="&#x0E0D;"

                latin:keyLabelFlags="fontNormal" />

            <!-- U+0E10: "ฐ" THAI CHARACTER THO THAN -->

            <Key

                latin:keyLabel="&#x0E10;"

                latin:keyLabelFlags="fontNormal" />

            <Key

                latin:keyLabel="," />

            <!-- U+0E05: "ฅ" THAI CHARACTER KHO KHON -->

            <Key

                latin:keyLabel="&#x0E05;"

                latin:keyLabelFlags="fontNormal" />

        </case>

        <default>

            <!-- U+0E46: "ๆ" THAI CHARACTER MAIYAMOK -->

            <Key

                latin:keyLabel="&#x0E46;"

                latin:keyLabelFlags="fontNormal" />

            <!-- U+0E44: "ไ" THAI CHARACTER SARA AI MAIMALAI -->

            <Key

                latin:keyLabel="&#x0E44;"

                latin:keyLabelFlags="fontNormal" />

            <!-- U+0E33: "ำ" THAI CHARACTER SARA AM -->

            <Key

                latin:keyLabel="&#x0E33;"

                latin:keyLabelFlags="fontNormal" />

            <!-- U+0E1E: "พ" THAI CHARACTER PHO PHAN -->

            <Key

                latin:keyLabel="&#x0E1E;"

                latin:keyLabelFlags="fontNormal" />

            <!-- U+0E30: "ะ" THAI CHARACTER SARA A -->

            <Key

                latin:keyLabel="&#x0E30;"

                latin:keyLabelFlags="fontNormal" />

            <!-- U+0020: " " SPACE

                 U+0E31: " ั" THAI CHARACTER MAI HAN-AKAT -->

            <!-- Note: The space character is needed as a preceding letter to draw some Thai

                 composing characters correctly. -->

            <Key

                latin:keyLabel="&#x20;&#x0E31;"

                latin:code="0x0E31"

                latin:keyLabelFlags="fontNormal|followKeyLetterRatio" />

            <!-- U+0020: " " SPACE

                 U+0E35: " ี" HAI CHARACTER SARA II -->

            <!-- Note: The space character is needed as a preceding letter to draw some Thai

                 composing characters correctly. -->

            <Key

                latin:keyLabel="&#x20;&#x0E35;"

                latin:code="0x0E35"

                latin:keyLabelFlags="fontNormal|followKeyLetterRatio" />

            <!-- U+0E23: "ร" THAI CHARACTER RO RUA -->

            <Key

                latin:keyLabel="&#x0E23;"

                latin:keyLabelFlags="fontNormal" />

            <!-- U+0E19: "น" THAI CHARACTER NO NU -->

            <Key

                latin:keyLabel="&#x0E19;"

                latin:keyLabelFlags="fontNormal" />

            <!-- U+0E22: "ย" THAI CHARACTER YO YAK -->

            <Key

                latin:keyLabel="&#x0E22;"

                latin:keyLabelFlags="fontNormal" />

            <!-- U+0E1A: "บ" THAI CHARACTER BO BAIMAI -->

            <Key

                latin:keyLabel="&#x0E1A;"

                latin:keyLabelFlags="fontNormal" />

            <!-- U+0E25: "ล" THAI CHARACTER LO LING -->

            <Key

                latin:keyLabel="&#x0E25;"

                latin:keyLabelFlags="fontNormal" />

            <!-- U+0E03: "ฃ" THAI CHARACTER KHO KHUAT -->

            <Key

                latin:keyLabel="&#x0E03;"

                latin:keyLabelFlags="fontNormal" />

        </default>

    </switch>

</merge>

java/res/xml-sw600dp/rowkeys_thai3.xml

deleted100644 → 0
+0 −134
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

/*

**

** Copyright 2012, 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+0E24: "ฤ" THAI CHARACTER RU -->

            <Key

                latin:keyLabel="&#x0E24;"

                latin:keyLabelFlags="fontNormal" />

            <!-- U+0E06: "ฆ" THAI CHARACTER KHO RAKHANG -->

            <Key

                latin:keyLabel="&#x0E06;"

                latin:keyLabelFlags="fontNormal" />

            <!-- U+0E0F: "ฏ" THAI CHARACTER TO PATAK -->

            <Key

                latin:keyLabel="&#x0E0F;"

                latin:keyLabelFlags="fontNormal" />

            <!-- U+0E42: "โ" THAI CHARACTER SARA O -->

            <Key

                latin:keyLabel="&#x0E42;"

                latin:keyLabelFlags="fontNormal" />

            <!-- U+0E0C: "ฌ" THAI CHARACTER CHO CHOE -->

            <Key

                latin:keyLabel="&#x0E0C;"

                latin:keyLabelFlags="fontNormal" />

            <!-- U+0020: " " SPACE

                 U+0E47: " ็" THAI CHARACTER MAITAIKHU -->

            <!-- Note: The space character is needed as a preceding letter to draw some Thai

                 composing characters correctly. -->

            <Key

                latin:keyLabel="&#x20;&#x0E47;"

                latin:code="0x0E47"

                latin:keyLabelFlags="fontNormal|followKeyLetterRatio" />

            <!-- U+0020: " " SPACE

                 U+0E4B: " ๋" THAI CHARACTER MAI CHATTAWA -->

            <!-- Note: The space character is needed as a preceding letter to draw some Thai

                 composing characters correctly. -->

            <Key

                latin:keyLabel="&#x20;&#x0E4B;"

                latin:code="0x0E4B"

                latin:keyLabelFlags="fontNormal|followKeyLetterRatio" />

            <!-- U+0E29: "ษ" THAI CHARACTER SO RUSI -->

            <Key

                latin:keyLabel="&#x0E29;"

                latin:keyLabelFlags="fontNormal" />

            <!--  U+0E28: "ศ" THAI CHARACTER SO SALA -->

            <Key

                latin:keyLabel="&#x0E28;"

                latin:keyLabelFlags="fontNormal" />

            <!-- U+0E0B: "ซ" THAI CHARACTER SO SO -->

            <Key

                latin:keyLabel="&#x0E0B;"

                latin:keyLabelFlags="fontNormal" />

            <Key

                latin:keyLabel="." />

        </case>

        <default>

            <!-- U+0E1F: "ฟ" THAI CHARACTER FO FAN -->

            <Key

                latin:keyLabel="&#x0E1F;"

                latin:keyLabelFlags="fontNormal" />

            <!-- U+0E2B: "ห" THAI CHARACTER HO HIP -->

            <Key

                latin:keyLabel="&#x0E2B;"

                latin:keyLabelFlags="fontNormal" />

            <!-- U+0E01: "ก" THAI CHARACTER KO KAI -->

            <Key

                latin:keyLabel="&#x0E01;"

                latin:keyLabelFlags="fontNormal" />

            <!-- U+0E14: "ด" THAI CHARACTER DO DEK -->

            <Key

                latin:keyLabel="&#x0E14;"

                latin:keyLabelFlags="fontNormal" />

            <!-- U+0E40: "เ" THAI CHARACTER SARA E -->

            <Key

                latin:keyLabel="&#x0E40;"

                latin:keyLabelFlags="fontNormal" />

            <!-- U+0020: " " SPACE

                 U+0E49: " ้" THAI CHARACTER MAI THO -->

            <!-- Note: The space character is needed as a preceding letter to draw some Thai

                 composing characters correctly. -->

            <Key

                latin:keyLabel="&#x20;&#x0E49;"

                latin:code="0x0E49"

                latin:keyLabelFlags="fontNormal|followKeyLetterRatio" />

            <!-- U+0020: " " SPACE

                 U+0E48: " ฺ" THAI CHARACTER MAI EK -->

            <!-- Note: The space character is needed as a preceding letter to draw some Thai

                 composing characters correctly. -->

            <Key

                latin:keyLabel="&#x20;&#x0E48;"

                latin:code="0x0E48"

                latin:keyLabelFlags="fontNormal|followKeyLetterRatio" />

            <!-- U+0E32: "า" THAI CHARACTER SARA AA -->

            <Key

                latin:keyLabel="&#x0E32;"

                latin:keyLabelFlags="fontNormal" />

            <!-- U+0E2A: "ส" THAI CHARACTER SO SUA -->

            <Key

                latin:keyLabel="&#x0E2A;"

                latin:keyLabelFlags="fontNormal" />

            <!-- U+0E27: "ว" THAI CHARACTER WO WAEN -->

            <Key

                latin:keyLabel="&#x0E27;"

                latin:keyLabelFlags="fontNormal" />

            <!-- U+0E07: "ง" THAI CHARACTER NGO NGU -->

            <Key

                latin:keyLabel="&#x0E07;"

                latin:keyLabelFlags="fontNormal" />

        </default>

    </switch>

</merge>

java/res/xml-sw600dp/rows_thai.xml

+5 −4
Original line number Diff line number Diff line
@@ -27,8 +27,7 @@ 
        latin:keyWidth="7.5%p"

    >

        <include

            latin:keyboardLayout="@xml/rowkeys_thai1"

            latin:keyXPos="3.75%p" />

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

        <Key

            latin:keyStyle="deleteKeyStyle"

            latin:keyWidth="fillRight" />
@@ -38,14 +37,16 @@ 
    >

        <include

            latin:keyboardLayout="@xml/rowkeys_thai2"

            latin:keyXPos="0.719%p" />

            latin:keyXPos="2.5%p" />

        <include

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

    </Row>

    <Row

        latin:keyWidth="7.5%p"

    >

        <include

            latin:keyboardLayout="@xml/rowkeys_thai3"

            latin:keyXPos="3.75%p" />

            latin:keyXPos="5.0%p" />

        <Key

            latin:keyStyle="enterKeyStyle"

            latin:keyWidth="fillRight" />