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

Commit 6024e847 authored by Tadashi G. Takaoka's avatar Tadashi G. Takaoka Committed by Android (Google) Code Review
Browse files

Merge "Support preliminary Hindi Keyboard"

parents d0d25ac8 53eca32f

java/res/xml-hi/keyboard_set.xml

0 → 100644
+42 −0
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.

*/

-->



<KeyboardSet

    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"

    latin:keyboardLocale="hi">

    <Element

        latin:elementName="alphabet"

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

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

</KeyboardSet>

java/res/xml-sw600dp/rows_hindi.xml

0 → 100644
+61 −0
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"

>

    <include

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

    <Row

        latin:keyWidth="7.6%p"

    >

        <include

            latin:keyboardLayout="@xml/rowkeys_hindi1"

            latin:keyLabelFlags="disableAdditionalMoreKeys|disableKeyHintLabel" />

        <Key

            latin:keyStyle="deleteKeyStyle"

            latin:keyWidth="fillBoth" />

    </Row>

    <Row

        latin:keyWidth="7.6%p"

    >

        <include

            latin:keyboardLayout="@xml/rowkeys_hindi2"

            latin:keyXPos="4.500%p" />

        <Key

            latin:keyStyle="enterKeyStyle"

            latin:keyWidth="fillBoth" />

    </Row>

    <Row

        latin:keyWidth="6.923%p"

    >

        <Key

            latin:keyStyle="shiftKeyStyle"

            latin:keyWidth="10.0%p" />

        <include

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

        <include

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

        <include

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

    </Row>

    <include

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

</merge>

java/res/xml-sw768dp/rows_hindi.xml

0 → 100644
+65 −0
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"

>

    <include

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

    <Row

        latin:keyWidth="7.333%p"

    >

        <Key

            latin:keyStyle="tabKeyStyle"

            latin:keyLabelFlags="alignLeft" />

        <include

            latin:keyboardLayout="@xml/rowkeys_hindi1"

            latin:keyLabelFlags="disableAdditionalMoreKeys|disableKeyHintLabel" />

        <Key

            latin:keyStyle="deleteKeyStyle"

            latin:keyWidth="fillBoth" />

    </Row>

    <Row

        latin:keyWidth="7.194%p"

    >

        <Key

            latin:keyStyle="toSymbolKeyStyle"

            latin:keyLabelFlags="alignLeft"

            latin:keyWidth="9.375%p" />

        <include

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

        <Key

            latin:keyStyle="enterKeyStyle"

            latin:keyWidth="fillBoth" />

    </Row>

    <Row

        latin:keyWidth="7.135%p"

    >

        <Key

            latin:keyStyle="shiftKeyStyle"

            latin:keyWidth="14.375%p" />

        <include

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

        <include

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

    </Row>

    <include

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

</merge>

java/res/xml/kbd_hindi.xml

0 → 100644
+26 −0
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"

>

    <include

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

</Keyboard>

java/res/xml/method.xml

+7 −0
Original line number Diff line number Diff line
@@ -38,6 +38,7 @@ 
    fr: French/azerty

    fr_CA: French Canada/qwerty

    fr_CH: French Switzerland/qwertz

    hi: Hindi/hindi

    hr: Croatian/qwertz

    hu: Hungarian/qwertz

    it: Italian/qwerty
@@ -169,6 +170,12 @@ 
            android:imeSubtypeMode="keyboard"

            android:imeSubtypeExtraValue="AsciiCapable,SupportTouchPositionCorrection"

    />

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

            android:label="@string/subtype_generic"

            android:imeSubtypeLocale="hi"

            android:imeSubtypeMode="keyboard"

            android:imeSubtypeExtraValue="SupportTouchPositionCorrection"

    />

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

            android:label="@string/subtype_generic"

            android:imeSubtypeLocale="hr"