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

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

Merge "Fix Serbian (Cyrillic) keyboard layout"

parents 4ef1b6b6 287d0d47

java/res/xml-xlarge/kbd_sr_rows.xml

+11 −9
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ 
        <Key

            latin:keyStyle="tabKeyStyle"

            latin:keyLabelOption="alignLeft"

            latin:keyWidth="7.949%p"

            latin:keyWidth="8.640%p"

            latin:keyEdgeFlags="left" />

        <Key

            latin:keyLabel="љ"
@@ -66,7 +66,7 @@ 
            latin:keyLabel="ш" />

        <Key

            latin:keyStyle="deleteKeyStyle"

            latin:keyWidth="9.331%p"

            latin:keyWidth="8.640%p"

            latin:keyEdgeFlags="right" />

    </Row>

    <Row
@@ -75,7 +75,7 @@ 
        <Key

            latin:keyStyle="toSymbolKeyStyle"

            latin:keyLabelOption="alignLeft"

            latin:keyWidth="7.949%p"

            latin:keyWidth="8.640%p"

            latin:keyEdgeFlags="left" />

        <Key

            latin:keyLabel="а" />
@@ -101,7 +101,7 @@ 
            latin:keyLabel="ћ" />

        <Key

            latin:keyStyle="returnKeyStyle"

            latin:keyWidth="9.331%p"

            latin:keyWidth="8.640%p"

            latin:keyEdgeFlags="right" />

    </Row>

    <Row
@@ -109,12 +109,10 @@ 
    >

        <Key

            latin:keyStyle="shiftKeyStyle"

            latin:keyWidth="12.400%p"

            latin:keyWidth="8.640%p"

            latin:keyEdgeFlags="left" />

        <Key

            latin:keyLabel="ђ" />

        <Key

            latin:keyLabel="ж" />

            latin:keyLabel="ѕ" />

        <Key

            latin:keyLabel="џ" />

        <Key
@@ -127,6 +125,10 @@ 
            latin:keyLabel="н" />

        <Key

            latin:keyLabel="м" />

        <Key

            latin:keyLabel="ђ" />

        <Key

            latin:keyLabel="ж" />

        <Key

            latin:keyLabel=","

            latin:manualTemporaryUpperCaseCode="33"
@@ -141,7 +143,7 @@ 
            latin:popupCharacters="\?" />

        <Key

            latin:keyStyle="shiftKeyStyle"

            latin:keyWidth="12.400%p"

            latin:keyWidth="8.640%p"

            latin:keyEdgeFlags="right" />

    </Row>

    <include

java/res/xml/kbd_sr_rows.xml

+9 −8
Original line number Diff line number Diff line
@@ -73,7 +73,7 @@ 
            latin:keyEdgeFlags="right" />

    </Row>

    <Row

        latin:keyWidth="8.333%p"

        latin:keyWidth="9.09%p"

    >

        <Key

            latin:keyLabel="а"
@@ -97,20 +97,17 @@ 
        <Key

            latin:keyLabel="ч" />

        <Key

            latin:keyLabel="ћ" />

        <Key

            latin:keyLabel="ђ"

            latin:keyLabel="ћ"

            latin:keyEdgeFlags="right" />

    </Row>

    <Row

        latin:keyWidth="8.5%p"

        latin:keyWidth="8.90%p"

    >

        <Key

            latin:keyStyle="shiftKeyStyle"

            latin:keyWidth="11.75%p"

            latin:keyEdgeFlags="left" />

        <Key

            latin:keyLabel="ж" />

            latin:keyLabel="ѕ" />

        <Key

            latin:keyLabel="џ" />

        <Key
@@ -123,9 +120,13 @@ 
            latin:keyLabel="н" />

        <Key

            latin:keyLabel="м" />

        <Key

            latin:keyLabel="ђ" />

        <Key

            latin:keyLabel="ж" />

        <Key

            latin:keyStyle="deleteKeyStyle"

            latin:keyWidth="11.75%p"

            latin:keyWidth="11.00%p"

            latin:keyEdgeFlags="right" />

    </Row>

    <include