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

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

Fix Serbian (Cyrillic) keyboard layout (DO NOT MERGE)

Cherry-pick: Iae1d8e9752c355d08d7f3d0fe7057fce61ea702f
Bug: 4406840
Change-Id: I5e0109b427093a459d2937809498985dc8409f97
parent 3f72d813
Loading
Loading
Loading
Loading
+24 −39
Original line number Diff line number Diff line
@@ -23,62 +23,61 @@
>
    <include
        latin:keyboardLayout="@xml/kbd_key_styles" />
    <!-- This row is intentionally not marked as a top row -->
    <Row
        latin:keyWidth="7.520%p"
        latin:keyWidth="9.09%p"
        latin:rowEdgeFlags="top"
    >
        <Key
            latin:keyStyle="tabKeyStyle"
            latin:keyLabelOption="alignLeft"
            latin:keyWidth="7.949%p"
            latin:keyEdgeFlags="left" />
        <Key
            latin:keyLabel="љ"
            latin:popupCharacters="1" />
            latin:keyHintIcon="@drawable/keyboard_hint_1"
            latin:popupCharacters="1"
            latin:keyEdgeFlags="left" />
        <Key
            latin:keyLabel="њ"
            latin:keyHintIcon="@drawable/keyboard_hint_2"
            latin:popupCharacters="2" />
        <Key
            latin:keyLabel="е"
            latin:keyHintIcon="@drawable/keyboard_hint_3"
            latin:popupCharacters="3" />
        <Key
            latin:keyLabel="р"
            latin:keyHintIcon="@drawable/keyboard_hint_4"
            latin:popupCharacters="4" />
        <Key
            latin:keyLabel="т"
            latin:keyHintIcon="@drawable/keyboard_hint_5"
            latin:popupCharacters="5" />
        <Key
            latin:keyLabel="з"
            latin:keyHintIcon="@drawable/keyboard_hint_6"
            latin:popupCharacters="6" />
        <Key
            latin:keyLabel="у"
            latin:keyHintIcon="@drawable/keyboard_hint_7"
            latin:popupCharacters="7" />
        <Key
            latin:keyLabel="и"
            latin:keyHintIcon="@drawable/keyboard_hint_8"
            latin:popupCharacters="8" />
        <Key
            latin:keyLabel="о"
            latin:keyHintIcon="@drawable/keyboard_hint_9"
            latin:popupCharacters="9" />
        <Key
            latin:keyLabel="п"
            latin:keyHintIcon="@drawable/keyboard_hint_0"
            latin:popupCharacters="0" />
        <Key
            latin:keyLabel="ш" />
        <Key
            latin:keyStyle="deleteKeyStyle"
            latin:keyWidth="9.331%p"
            latin:keyLabel="ш"
            latin:keyEdgeFlags="right" />
    </Row>
    <Row
        latin:keyWidth="7.520%p"
        latin:keyWidth="9.09%p"
    >
        <Key
            latin:keyStyle="toSymbolKeyStyle"
            latin:keyLabelOption="alignLeft"
            latin:keyWidth="7.949%p"
            latin:keyLabel="а"
            latin:keyEdgeFlags="left" />
        <Key
            latin:keyLabel="а" />
        <Key
            latin:keyLabel="с" />
        <Key
@@ -98,23 +97,17 @@
        <Key
            latin:keyLabel="ч" />
        <Key
            latin:keyLabel="ћ" />
        <Key
            latin:keyStyle="returnKeyStyle"
            latin:keyWidth="9.331%p"
            latin:keyLabel="ћ"
            latin:keyEdgeFlags="right" />
    </Row>
    <Row
        latin:keyWidth="7.520%p"
        latin:keyWidth="8.90%p"
    >
        <Key
            latin:keyStyle="shiftKeyStyle"
            latin:keyWidth="12.400%p"
            latin:keyEdgeFlags="left" />
        <Key
            latin:keyLabel="ђ" />
        <Key
            latin:keyLabel="ж" />
            latin:keyLabel="ѕ" />
        <Key
            latin:keyLabel="џ" />
        <Key
@@ -128,20 +121,12 @@
        <Key
            latin:keyLabel="м" />
        <Key
            latin:keyLabel=","
            latin:manualTemporaryUpperCaseCode="33"
            latin:keyHintIcon="@drawable/key_hint_exclamation_holo"
            latin:manualTemporaryUpperCaseHintIcon="@drawable/key_hint_exclamation_large_holo"
            latin:popupCharacters="!" />
            latin:keyLabel="ђ" />
        <Key
            latin:keyLabel="."
            latin:manualTemporaryUpperCaseCode="63"
            latin:keyHintIcon="@drawable/key_hint_question_holo"
            latin:manualTemporaryUpperCaseHintIcon="@drawable/key_hint_question_large_holo"
            latin:popupCharacters="\?" />
            latin:keyLabel="ж" />
        <Key
            latin:keyStyle="shiftKeyStyle"
            latin:keyWidth="12.400%p"
            latin:keyStyle="deleteKeyStyle"
            latin:keyWidth="11.00%p"
            latin:keyEdgeFlags="right" />
    </Row>
    <include
+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
+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