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

Commit 505b6ba1 authored by Ken Wakasa's avatar Ken Wakasa Committed by Android (Google) Code Review
Browse files

Merge "Add Lao keyboard"

parents 41aaff6c 47761678

java/res/xml-sw600dp/rows_lao.xml

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

<!--

/*

**

** Copyright 2013, 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="7.5%p"

    >

        <include

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

        <Key

            latin:keyStyle="deleteKeyStyle"

            latin:keyWidth="fillRight" />

        </Row>

    <Row

        latin:keyWidth="7.5%p"

    >

        <include

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

    </Row>

    <Row

        latin:keyWidth="7.5%p"

    >

        <include

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

        <Key

            latin:keyStyle="enterKeyStyle"

            latin:keyWidth="fillRight" />

    </Row>

    <Row

        latin:keyWidth="7.5%p"

    >

        <Key

            latin:keyStyle="shiftKeyStyle"

            latin:keyWidth="10.0%p" />

        <include

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

        <include

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

    </Row>

    <include

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

</merge>

java/res/xml/kbd_lao.xml

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

<!--

/*

**

** Copyright 2013, 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="@array/touch_position_correction_data_default"

>

    <include

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

</Keyboard>

java/res/xml/key_styles_currency.xml

+2 −1
Original line number Diff line number Diff line
@@ -95,6 +95,7 @@ 
        <!-- fa: Persian (Rial and Afgahni)

             hi: Hindi (Indian Rupee)

             iw: Hebrew (New Sheqel)

             lo: Lao (Kip)

             mn: Mongolian (Tugrik)

             th: Thai (Baht)

             uk: Ukrainian (Hryvnia)
@@ -102,7 +103,7 @@ 
        <!-- TODO: The currency sign of Turkish Lira was created in 2012 and assigned U+20BA for

             its unicode, although there is no font glyph for it as of November 2012. -->

        <case

            latin:languageCode="fa|hi|iw|mn|th|uk|vi"

            latin:languageCode="fa|hi|iw|lo|mn|th|uk|vi"

        >

            <!-- U+00A3: "£" POUND SIGN

                 U+20AC: "€" EURO SIGN

java/res/xml/keyboard_layout_set_lao.xml

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

<!--

/*

**

** Copyright 2013, 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_lao"

        latin:enableProximityCharsCorrection="true" />

    <Element

        latin:elementName="alphabetAutomaticShifted"

        latin:elementKeyboard="@xml/kbd_lao"

        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_lao" />

    <Element

        latin:elementName="alphabetShiftLocked"

        latin:elementKeyboard="@xml/kbd_lao" />

    <Element

        latin:elementName="alphabetShiftLockShifted"

        latin:elementKeyboard="@xml/kbd_lao" />

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

java/res/xml/method.xml

+8 −0
Original line number Diff line number Diff line
@@ -55,6 +55,7 @@ 
    ka: Georgian/georgian

    (kk: Kazakh/east_slavic) # disabled temporarily. waiting for strnig resources.

    ky: Kyrgyz/east_slavic

    lo: Lao/lao

    lt: Lithuanian/qwerty

    lv: Latvian/qwerty

    mk: Macedonian/south_slavic
@@ -330,6 +331,13 @@ 
            android:imeSubtypeMode="keyboard"

            android:imeSubtypeExtraValue="KeyboardLayoutSet=east_slavic"

    />

    <subtype android:icon="@drawable/ic_subtype_keyboard"

            android:label="@string/subtype_generic"

            android:subtypeId="0x8315772c"

            android:imeSubtypeLocale="lo"

            android:imeSubtypeMode="keyboard"

            android:imeSubtypeExtraValue="KeyboardLayoutSet=lao"

    />

    <subtype android:icon="@drawable/ic_subtype_keyboard"

            android:label="@string/subtype_generic"

            android:subtypeId="0x8321bb43"