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

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

Merge "Add Serbian Latin keyboard"

parents fd4cb4bd 8108a3e1

java/res/values/donottranslate.xml

+2 −0
Original line number Diff line number Diff line
@@ -31,11 +31,13 @@ 
        <item>en_GB</item>

        <item>es_US</item>

        <item>hi_ZZ</item>

        <item>sr_ZZ</item>

    </string-array>



    <!-- Subtype locale whose name should be displayed in Locale.ROOT. -->

    <string-array name="subtype_locale_displayed_in_root_locale">

        <item>hi_ZZ</item>

        <item>sr_ZZ</item>

    </string-array>



    <!-- Generic subtype label -->

java/res/values/strings.xml

+8 −6
Original line number Diff line number Diff line
@@ -207,6 +207,10 @@ 
    <string name="subtype_es_US">Spanish (US)</string>

    <!-- Description for Hinglish (https://en.wikipedia.org/wiki/Hinglish) keyboard subtype [CHAR LIMIT=25] -->

    <string name="subtype_hi_ZZ">Hinglish</string>

    <!-- Description for Serbian (Latin) keyboard subtype [CHAR LIMIT=25]

         (Latin) can be an abbreviation to fit in the CHAR LIMIT.

         Note for Serbian translator: this should be translated with Latin script and (Latin) should be omitted. -->

    <string name="subtype_sr_ZZ">Serbian (Latin)</string>

    <!-- Description for English (UK) keyboard subtype with explicit keyboard layout [CHAR LIMIT=25]

         (UK) should be an abbreviation of United Kingdom to fit in the CHAR LIMIT.

         This should be identical to subtype_en_GB aside from the trailing (%s). -->
@@ -222,6 +226,10 @@ 
    <!-- Description for Hinglish (https://en.wikipedia.org/wiki/Hinglish) keyboard subtype with explicit keyboard layout [CHAR LIMIT=25]

         This should be identical to subtype_hi_ZZ aside from the trailing (%s). -->

    <string name="subtype_with_layout_hi_ZZ">Hinglish (<xliff:g id="KEYBOARD_LAYOUT" example="QWERTY">%s</xliff:g>)</string>

    <!-- Description for Serbian (Latin) keyboard subtype with explicit keyboard layout [CHAR LIMIT=25]

         This should be identical to subtype_sr_ZZ aside from the trailing (%s).

         Note for Serbian translator: this should be translated with Latin script. -->

    <string name="subtype_with_layout_sr_ZZ">Serbian (<xliff:g id="KEYBOARD_LAYOUT" example="QWERTY">%s</xliff:g>)</string>

    <!-- Description for "LANGUAGE_NAME" (Traditional) keyboard subtype [CHAR LIMIT=25]

         (Traditional) can be an abbreviation to fit in the CHAR LIMIT. -->

    <string name="subtype_generic_traditional"><xliff:g id="LANGUAGE_NAME" example="Nepali">%s</xliff:g> (Traditional)</string>
@@ -229,12 +237,6 @@ 
         (Compact) can be an abbreviation to fit in the CHAR LIMIT.

         TODO: Remove translatable=false once we are settled down with the naming. -->

    <string name="subtype_generic_compact" translatable="false"><xliff:g id="LANGUAGE_NAME" example="Hindi">%s</xliff:g> (Compact)</string>

    <!-- Description for "LANGUAGE_NAME" (Cyrillic) keyboard subtype [CHAR LIMIT=25]

         (Cyrillic) can be an abbreviation to fit in the CHAR LIMIT. -->

    <string name="subtype_generic_cyrillic"><xliff:g id="LANGUAGE_NAME" example="Serbian">%s</xliff:g> (Cyrillic)</string>

    <!-- Description for "LANGUAGE_NAME" (Latin) keyboard subtype [CHAR LIMIT=25]

         (Latin) can be an abbreviation to fit in the CHAR LIMIT. -->

    <string name="subtype_generic_latin"><xliff:g id="LANGUAGE_NAME" example="Serbian">%s</xliff:g> (Latin)</string>

    <!-- This string is displayed in a language list that allows to choose a language for

suggestions in a software keyboard. This setting won't give suggestions in any particular

language, hence "No language".

java/res/xml-sw600dp/rows_serbian_qwertz.xml

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

<!--

/*

**

** Copyright 2014, 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="8.182%p" >

        <include latin:keyboardLayout="@xml/rowkeys_serbian_qwertz1" />

        <Key

            latin:keyStyle="deleteKeyStyle"

            latin:keyWidth="fillRight" />

    </Row>

    <Row latin:keyWidth="8.182%p" >

        <include latin:keyboardLayout="@xml/rowkeys_serbian_qwertz2" />

        <Key

            latin:keyStyle="enterKeyStyle"

            latin:keyWidth="fillRight" />

    </Row>

    <Row latin:keyWidth="8.182%p" >

        <Key

            latin:keyStyle="shiftKeyStyle"

            latin:keyWidth="10.0%p" />

        <include latin:keyboardLayout="@xml/rowkeys_serbian_qwertz3" />

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

    </Row>

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

</merge>

java/res/xml/kbd_serbian_qwertz.xml

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

<!--

/*

**

** Copyright 2014, 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_serbian_qwertz" />

</Keyboard>
 
 No newline at end of file

java/res/xml/keyboard_layout_set_serbian_qwertz.xml

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

<!--

/*

**

** Copyright 2014, 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:allowRedundantMoreKeys="false"

        latin:elementKeyboard="@xml/kbd_serbian_qwertz"

        latin:elementName="alphabet"

        latin:enableProximityCharsCorrection="true" />

    <Element

        latin:elementKeyboard="@xml/kbd_symbols"

        latin:elementName="symbols" />

    <Element

        latin:elementKeyboard="@xml/kbd_symbols_shift"

        latin:elementName="symbolsShifted" />

    <Element

        latin:elementKeyboard="@xml/kbd_phone"

        latin:elementName="phone" />

    <Element

        latin:elementKeyboard="@xml/kbd_phone_symbols"

        latin:elementName="phoneSymbols" />

    <Element

        latin:elementKeyboard="@xml/kbd_number"

        latin:elementName="number" />

</KeyboardLayoutSet>
 
 No newline at end of file