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

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

Breakdown Serbian keyboard into rows 

This change also slightly re-design 7-inch and 10-inch tablet layout

Change-Id: Ibfe11386d865f7c3becf4a60286557921f95036d
parent c1ca8815

java/res/xml-sw600dp/rowkeys_serbian1.xml

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

>

    <!-- U+0459: "љ" CYRILLIC SMALL LETTER LJE -->

    <Key

        latin:keyLabel="&#x0459;" />

    <!-- U+045A: "њ" CYRILLIC SMALL LETTER NJE -->

    <Key

        latin:keyLabel="&#x045A;" />

    <!-- U+0435: "е" CYRILLIC SMALL LETTER IE -->

    <Key

        latin:keyLabel="&#x0435;"

        latin:moreKeys="@string/more_keys_for_cyrillic_ie" />

    <!-- U+0440: "р" CYRILLIC SMALL LETTER ER -->

    <Key

        latin:keyLabel="&#x0440;" />

    <!-- U+0442: "т" CYRILLIC SMALL LETTER TE -->

    <Key

        latin:keyLabel="&#x0442;" />

    <Key

        latin:keyLabel="@string/keylabel_for_cyrillic_ze" />

    <!-- U+0443: "у" CYRILLIC SMALL LETTER U -->

    <Key

        latin:keyLabel="&#x0443;" />

    <!-- U+0438: "и" CYRILLIC SMALL LETTER I -->

    <Key

        latin:keyLabel="&#x0438;"

        latin:moreKeys="@string/more_keys_for_cyrillic_i" />

    <!-- U+043E: "о" CYRILLIC SMALL LETTER O -->

    <Key

        latin:keyLabel="&#x043E;" />

    <!-- U+043F: "п" CYRILLIC SMALL LETTER PE -->

    <Key

        latin:keyLabel="&#x043F;" />

    <!-- U+0448: "ш" CYRILLIC SMALL LETTER SHA -->

    <Key

        latin:keyLabel="&#x0448;" />

</merge>

java/res/xml-sw600dp/rows_serbian.xml

+7 −92
Original line number Diff line number Diff line
@@ -26,41 +26,8 @@ 
    <Row

        latin:keyWidth="8.0%p"

    >

        <!-- U+0459: "љ" CYRILLIC SMALL LETTER LJE -->

        <Key

            latin:keyLabel="&#x0459;"

            latin:keyXPos="2.15%p" />

        <!-- U+045A: "њ" CYRILLIC SMALL LETTER NJE -->

        <Key

            latin:keyLabel="&#x045A;" />

        <!-- U+0435: "е" CYRILLIC SMALL LETTER IE -->

        <Key

            latin:keyLabel="&#x0435;"

            latin:moreKeys="@string/more_keys_for_cyrillic_ie" />

        <!-- U+0440: "р" CYRILLIC SMALL LETTER ER -->

        <Key

            latin:keyLabel="&#x0440;" />

        <!-- U+0442: "т" CYRILLIC SMALL LETTER TE -->

        <Key

            latin:keyLabel="&#x0442;" />

        <Key

            latin:keyLabel="@string/keylabel_for_cyrillic_ze" />

        <!-- U+0443: "у" CYRILLIC SMALL LETTER U -->

        <Key

            latin:keyLabel="&#x0443;" />

        <!-- U+0438: "и" CYRILLIC SMALL LETTER I -->

        <Key

            latin:keyLabel="&#x0438;"

            latin:moreKeys="@string/more_keys_for_cyrillic_i" />

        <!-- U+043E: "о" CYRILLIC SMALL LETTER O -->

        <Key

            latin:keyLabel="&#x043E;" />

        <!-- U+043F: "п" CYRILLIC SMALL LETTER PE -->

        <Key

            latin:keyLabel="&#x043F;" />

        <!-- U+0448: "ш" CYRILLIC SMALL LETTER SHA -->

        <Key

            latin:keyLabel="&#x0448;" />

        <include

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

        <Key

            latin:keyStyle="deleteKeyStyle"

            latin:keyXPos="-10.0%p"
@@ -69,38 +36,9 @@ 
    <Row

        latin:keyWidth="7.9%p"

    >

        <!-- U+0430: "а" CYRILLIC SMALL LETTER A -->

        <Key

            latin:keyLabel="&#x0430;" />

        <!-- U+0441: "с" CYRILLIC SMALL LETTER ES -->

        <Key

            latin:keyLabel="&#x0441;" />

        <!-- U+0434: "д" CYRILLIC SMALL LETTER DE -->

        <Key

            latin:keyLabel="&#x0434;" />

        <!-- U+0444: "ф" CYRILLIC SMALL LETTER EF -->

        <Key

            latin:keyLabel="&#x0444;" />

        <!-- U+0433: "г" CYRILLIC SMALL LETTER GHE -->

        <Key

            latin:keyLabel="&#x0433;" />

        <!-- U+0445: "х" CYRILLIC SMALL LETTER HA -->

        <Key

            latin:keyLabel="&#x0445;" />

        <!-- U+0458: "ј" CYRILLIC SMALL LETTER JE -->

        <Key

            latin:keyLabel="&#x0458;" />

        <!-- U+043A: "к" CYRILLIC SMALL LETTER KA -->

        <Key

            latin:keyLabel="&#x043A;" />

        <!-- U+043B: "л" CYRILLIC SMALL LETTER EL -->

        <Key

            latin:keyLabel="&#x043B;" />

        <!-- U+0447: "ч" CYRILLIC SMALL LETTER CHE -->

        <Key

            latin:keyLabel="&#x0447;" />

        <Key

            latin:keyLabel="@string/keylabel_for_cyrillic_tshe" />

        <include

            latin:keyboardLayout="@xml/rowkeys_serbian2"

            latin:keyXPos="2.15%p" />

        <Key

            latin:keyStyle="enterKeyStyle"

            latin:keyXPos="-14.6%p"
@@ -112,31 +50,8 @@ 
        <Key

            latin:keyStyle="shiftKeyStyle"

            latin:keyWidth="8.0%p" />

        <Key

            latin:keyLabel="@string/keylabel_for_cyrillic_dze" />

        <!-- U+045F: "џ" CYRILLIC SMALL LETTER DZHE -->

        <Key

            latin:keyLabel="&#x045F;" />

        <!-- U+0446: "ц" CYRILLIC SMALL LETTER TSE -->

        <Key

            latin:keyLabel="&#x0446;" />

        <!-- U+0432: "в" CYRILLIC SMALL LETTER VE -->

        <Key

            latin:keyLabel="&#x0432;" />

        <!-- U+0431: "б" CYRILLIC SMALL LETTER BE -->

        <Key

            latin:keyLabel="&#x0431;" />

        <!-- U+043D: "н" CYRILLIC SMALL LETTER EN -->

        <Key

            latin:keyLabel="&#x043D;" />

        <!-- U+043C: "м" CYRILLIC SMALL LETTER EM -->

        <Key

            latin:keyLabel="&#x043C;" />

        <Key

            latin:keyLabel="@string/keylabel_for_cyrillic_dje" />

        <!-- U+0436: "ж" CYRILLIC SMALL LETTER ZHE -->

        <Key

            latin:keyLabel="&#x0436;" />

        <include

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

        <include

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

        <include

java/res/xml-sw768dp/rows_serbian.xml

+11 −100
Original line number Diff line number Diff line
@@ -29,47 +29,12 @@ 
        <Key

            latin:keyStyle="tabKeyStyle"

            latin:keyLabelFlags="alignLeft" />

        <!-- U+0459: "љ" CYRILLIC SMALL LETTER LJE -->

        <Key

            latin:keyLabel="&#x0459;" />

        <!-- U+045A: "њ" CYRILLIC SMALL LETTER NJE -->

        <Key

            latin:keyLabel="&#x045A;" />

        <!-- U+0435: "е" CYRILLIC SMALL LETTER IE -->

        <Key

            latin:keyLabel="&#x0435;"

            latin:moreKeys="@string/more_keys_for_cyrillic_ie" />

        <!-- U+0440: "р" CYRILLIC SMALL LETTER ER -->

        <Key

            latin:keyLabel="&#x0440;" />

        <!-- U+0442: "т" CYRILLIC SMALL LETTER TE -->

        <Key

            latin:keyLabel="&#x0442;" />

        <Key

            latin:keyLabel="@string/keylabel_for_cyrillic_ze" />

        <!-- U+0443: "у" CYRILLIC SMALL LETTER U -->

        <Key

            latin:keyLabel="&#x0443;" />

        <!-- U+0438: "и" CYRILLIC SMALL LETTER I -->

        <Key

            latin:keyLabel="&#x0438;"

            latin:moreKeys="@string/more_keys_for_cyrillic_i" />

        <!-- U+043E: "о" CYRILLIC SMALL LETTER O -->

        <Key

            latin:keyLabel="&#x043E;" />

        <!-- U+043F: "п" CYRILLIC SMALL LETTER PE -->

        <Key

            latin:keyLabel="&#x043F;" />

        <!-- U+0448: "ш" CYRILLIC SMALL LETTER SHA -->

        <Key

            latin:keyLabel="&#x0448;" />

        <!-- U+0452: "ђ" CYRILLIC SMALL LETTER DJE -->

        <Key

            latin:keyLabel="&#x0452;" />

        <!-- U+0436: "ж" CYRILLIC SMALL LETTER ZHE -->

        <include

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

        <Key

            latin:keyLabel="&#x0436;"

            latin:keyWidth="fillRight" />

            latin:keyStyle="deleteKeyStyle"

            latin:keyXPos="-9.219%p"

            latin:keyWidth="fillBoth" />

    </Row>

    <Row

        latin:keyWidth="7.250%p"
@@ -78,41 +43,11 @@ 
            latin:keyStyle="toSymbolKeyStyle"

            latin:keyLabelFlags="alignLeft"

            latin:keyWidth="11.172%p" />

        <!-- U+0430: "а" CYRILLIC SMALL LETTER A -->

        <Key

            latin:keyLabel="&#x0430;" />

        <!-- U+0441: "с" CYRILLIC SMALL LETTER ES -->

        <Key

            latin:keyLabel="&#x0441;" />

        <!-- U+0434: "д" CYRILLIC SMALL LETTER DE -->

        <Key

            latin:keyLabel="&#x0434;" />

        <!-- U+0444: "ф" CYRILLIC SMALL LETTER EF -->

        <Key

            latin:keyLabel="&#x0444;" />

        <!-- U+0433: "г" CYRILLIC SMALL LETTER GHE -->

        <Key

            latin:keyLabel="&#x0433;" />

        <!-- U+0445: "х" CYRILLIC SMALL LETTER HA -->

        <Key

            latin:keyLabel="&#x0445;" />

        <!-- U+0458: "ј" CYRILLIC SMALL LETTER JE -->

        <Key

            latin:keyLabel="&#x0458;" />

        <!-- U+043A: "к" CYRILLIC SMALL LETTER KA -->

        <Key

            latin:keyLabel="&#x043A;" />

        <!-- U+043B: "л" CYRILLIC SMALL LETTER EL -->

        <Key

            latin:keyLabel="&#x043B;" />

        <!-- U+0447: "ч" CYRILLIC SMALL LETTER CHE -->

        <Key

            latin:keyLabel="&#x0447;" />

        <Key

            latin:keyLabel="@string/keylabel_for_cyrillic_tshe" />

        <include

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

        <Key

            latin:keyStyle="deleteKeyStyle"

            latin:keyXPos="-9.219%p"

            latin:keyStyle="enterKeyStyle"

            latin:keyXPos="-15.704%p"

            latin:keyWidth="fillBoth" />

    </Row>

    <Row
@@ -121,34 +56,10 @@ 
        <Key

            latin:keyStyle="shiftKeyStyle"

            latin:keyWidth="13.829%p" />

        <Key

            latin:keyLabel="@string/keylabel_for_cyrillic_dze" />

        <!-- U+045F: "џ" CYRILLIC SMALL LETTER DZHE -->

        <Key

            latin:keyLabel="&#x045F;" />

        <!-- U+0446: "ц" CYRILLIC SMALL LETTER TSE -->

        <Key

            latin:keyLabel="&#x0446;" />

        <!-- U+0432: "в" CYRILLIC SMALL LETTER VE -->

        <Key

            latin:keyLabel="&#x0432;" />

        <!-- U+0431: "б" CYRILLIC SMALL LETTER BE -->

        <Key

            latin:keyLabel="&#x0431;" />

        <!-- U+043D: "н" CYRILLIC SMALL LETTER EN -->

        <Key

            latin:keyLabel="&#x043D;" />

        <!-- U+043C: "м" CYRILLIC SMALL LETTER EM -->

        <Key

            latin:keyLabel="&#x043C;" />

        <Key

            latin:keyLabel="@string/keylabel_for_cyrillic_dje" />

        <include

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

        <include

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

        <Key

            latin:keyStyle="enterKeyStyle"

            latin:keyXPos="-13.750%p"

            latin:keyWidth="fillRight" />

    </Row>

    <include

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

java/res/xml/rowkeys_serbian1.xml

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

>

    <!-- U+0459: "љ" CYRILLIC SMALL LETTER LJE -->

    <Key

        latin:keyLabel="&#x0459;"

        latin:keyHintLabel="1"

        latin:additionalMoreKeys="1" />

    <!-- U+045A: "њ" CYRILLIC SMALL LETTER NJE -->

    <Key

        latin:keyLabel="&#x045A;"

        latin:keyHintLabel="2"

        latin:additionalMoreKeys="2" />

    <!-- U+0435: "е" CYRILLIC SMALL LETTER IE -->

    <Key

        latin:keyLabel="&#x0435;"

        latin:keyHintLabel="3"

        latin:additionalMoreKeys="3"

        latin:moreKeys="@string/more_keys_for_cyrillic_ie" />

    <!-- U+0440: "р" CYRILLIC SMALL LETTER ER -->

    <Key

        latin:keyLabel="&#x0440;"

        latin:keyHintLabel="4"

        latin:additionalMoreKeys="4" />

    <!-- U+0442: "т" CYRILLIC SMALL LETTER TE -->

    <Key

        latin:keyLabel="&#x0442;"

        latin:keyHintLabel="5"

        latin:additionalMoreKeys="5" />

    <Key

        latin:keyLabel="@string/keylabel_for_cyrillic_ze"

        latin:keyHintLabel="6"

        latin:additionalMoreKeys="6" />

    <!-- U+0443: "у" CYRILLIC SMALL LETTER U -->

    <Key

        latin:keyLabel="&#x0443;"

        latin:keyHintLabel="7"

        latin:additionalMoreKeys="7" />

    <!-- U+0438: "и" CYRILLIC SMALL LETTER I -->

    <Key

        latin:keyLabel="&#x0438;"

        latin:keyHintLabel="8"

        latin:additionalMoreKeys="8"

        latin:moreKeys="@string/more_keys_for_cyrillic_i" />

    <!-- U+043E: "о" CYRILLIC SMALL LETTER O -->

    <Key

        latin:keyLabel="&#x043E;"

        latin:keyHintLabel="9"

        latin:additionalMoreKeys="9" />

    <!-- U+043F: "п" CYRILLIC SMALL LETTER PE -->

    <Key

        latin:keyLabel="&#x043F;"

        latin:keyHintLabel="0"

        latin:additionalMoreKeys="0" />

    <!-- U+0448: "ш" CYRILLIC SMALL LETTER SHA -->

    <Key

        latin:keyLabel="&#x0448;" />

</merge>

java/res/xml/rowkeys_serbian2.xml

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

>

    <!-- U+0430: "а" CYRILLIC SMALL LETTER A -->

    <Key

        latin:keyLabel="&#x0430;" />

    <!-- U+0441: "с" CYRILLIC SMALL LETTER ES -->

    <Key

        latin:keyLabel="&#x0441;" />

    <!-- U+0434: "д" CYRILLIC SMALL LETTER DE -->

    <Key

        latin:keyLabel="&#x0434;" />

    <!-- U+0444: "ф" CYRILLIC SMALL LETTER EF -->

    <Key

        latin:keyLabel="&#x0444;" />

    <!-- U+0433: "г" CYRILLIC SMALL LETTER GHE -->

    <Key

        latin:keyLabel="&#x0433;" />

    <!-- U+0445: "х" CYRILLIC SMALL LETTER HA -->

    <Key

        latin:keyLabel="&#x0445;" />

    <!-- U+0458: "ј" CYRILLIC SMALL LETTER JE -->

    <Key

        latin:keyLabel="&#x0458;" />

    <!-- U+043A: "к" CYRILLIC SMALL LETTER KA -->

    <Key

        latin:keyLabel="&#x043A;" />

    <!-- U+043B: "л" CYRILLIC SMALL LETTER EL -->

    <Key

        latin:keyLabel="&#x043B;" />

    <!-- U+0447: "ч" CYRILLIC SMALL LETTER CHE -->

    <Key

        latin:keyLabel="&#x0447;" />

    <Key

        latin:keyLabel="@string/keylabel_for_cyrillic_tshe" />

</merge>