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

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

Remove unnecessary android:codes attribute 

If there is no android:codes specified, the first character of
keyLabel's code point will be used instead.

Also introduce readable codes as @integer/key_XXX resources

Bug: 2973749
Change-Id: If9021ca35f9a7b922817e2099186fce0cd993652
parent 12b6fef3

java/res/values/keycodes.xml

+6 −0
Original line number Diff line number Diff line
@@ -19,6 +19,12 @@ 
-->



<resources>

    <integer name="key_tab">9</integer>

    <integer name="key_return">10</integer>

    <integer name="key_space">32</integer>

    <integer name="key_shift">-1</integer>

    <integer name="key_symbol">-2</integer>

    <integer name="key_delete">-5</integer>

    <!-- Keycode for F1 (function) key. This one switches between language switch & comma/.com -->

    <integer name="key_settings">-100</integer>

    <integer name="key_f1">-103</integer>

java/res/xml-da/kbd_qwerty.xml

+17 −45
Original line number Diff line number Diff line
@@ -33,50 +33,40 @@ 
>

    <Row>

        <Key

            android:codes="113"

            android:keyLabel="q"

            android:keyWidth="8.75%p"

            android:keyEdgeFlags="left" />

        <Key

            android:codes="119"

            android:keyLabel="w" />

        <Key

            android:codes="101"

            android:keyLabel="e"

            android:popupKeyboard="@xml/kbd_popup_template"

            android:popupCharacters="éèêëę€" />

        <Key

            android:codes="114"

            android:keyLabel="r"

            android:popupKeyboard="@xml/kbd_popup_template"

            android:popupCharacters="ř" />

        <Key

            android:codes="116"

            android:keyLabel="t"

            android:popupKeyboard="@xml/kbd_popup_template"

            android:popupCharacters="ťþ" />

        <Key

            android:codes="121"

            android:keyLabel="y"

            android:popupKeyboard="@xml/kbd_popup_template"

            android:popupCharacters="ýÿü" />

        <Key

            android:codes="117"

            android:keyLabel="u"

            android:popupKeyboard="@xml/kbd_popup_template"

            android:popupCharacters="úùûū" />

        <Key

            android:codes="105"

            android:keyLabel="i"

            android:popupKeyboard="@xml/kbd_popup_template"

            android:popupCharacters="íìîï" />

        <Key

            android:codes="111"

            android:keyLabel="o"

            android:popupKeyboard="@xml/kbd_popup_template"

            android:popupCharacters="óòôõ" />

        <Key

            android:codes="112"

            android:keyLabel="p" />

        <Key

            android:keyLabel="å"
@@ -85,39 +75,30 @@ 
    </Row>

    <Row>

        <Key

            android:codes="97"

            android:keyLabel="a"

            android:popupKeyboard="@xml/kbd_popup_template"

            android:popupCharacters="áàâąã"

            android:keyWidth="8.75%p"

            android:keyEdgeFlags="left" />

        <Key

            android:codes="115"

            android:keyLabel="s"

            android:popupKeyboard="@xml/kbd_popup_template"

            android:popupCharacters="śšşß" />

        <Key

            android:codes="100"

            android:keyLabel="d"

            android:popupKeyboard="@xml/kbd_popup_template"

            android:popupCharacters="ðď" />

        <Key

            android:codes="102"

            android:keyLabel="f" />

        <Key

            android:codes="103"

            android:keyLabel="g" />

        <Key

            android:codes="104"

            android:keyLabel="h" />

        <Key

            android:codes="106"

            android:keyLabel="j" />

        <Key

            android:codes="107"

            android:keyLabel="k" />

        <Key

            android:codes="108"

            android:keyLabel="l"

            android:popupKeyboard="@xml/kbd_popup_template"

            android:popupCharacters="ł" />
@@ -136,7 +117,7 @@ 
        android:keyWidth="10%p"

    >

        <Key

            android:codes="-1"

            android:codes="@integer/key_shift"

            android:keyIcon="@drawable/sym_keyboard_shift"

            android:keyWidth="15%p"

            android:isModifier="true"
@@ -144,36 +125,29 @@ 
            android:isSticky="true"

            android:keyEdgeFlags="left" />

        <Key

            android:codes="122"

            android:keyLabel="z"

            android:popupKeyboard="@xml/kbd_popup_template"

            android:popupCharacters="źžż" />

        <Key

            android:codes="120"

            android:keyLabel="x" />

        <Key

            android:codes="99"

            android:keyLabel="c"

            android:popupKeyboard="@xml/kbd_popup_template"

            android:popupCharacters="çćč" />

        <Key

            android:codes="118"

            android:keyLabel="v"

            android:popupKeyboard="@xml/kbd_popup_template"

            android:popupCharacters="w" />

        <Key

            android:codes="98"

            android:keyLabel="b" />

        <Key

            android:codes="110"

            android:keyLabel="n"

            android:popupKeyboard="@xml/kbd_popup_template"

            android:popupCharacters="ńñň" />

        <Key

            android:codes="109"

            android:keyLabel="m" />

        <Key

            android:codes="-5"

            android:codes="@integer/key_delete"

            android:keyIcon="@drawable/sym_keyboard_delete"

            android:keyWidth="15%p"

            android:keyEdgeFlags="right"
@@ -186,7 +160,7 @@ 
        android:rowEdgeFlags="bottom"

    >

        <Key

            android:codes="-2"

            android:codes="@integer/key_symbol"

            android:keyLabel="@string/label_symbol_key"

            android:keyWidth="15%p"

            android:keyEdgeFlags="left"
@@ -204,20 +178,19 @@ 
            android:keyWidth="10%p"

            android:isModifier="true" />

        <Key

            android:codes="32"

            android:codes="@integer/key_space"

            android:keyIcon="@drawable/sym_keyboard_space"

            android:iconPreview="@drawable/sym_keyboard_feedback_space"

            android:keyWidth="30%p"

            android:isRepeatable="true"

            android:isModifier="true" />

        <Key

            android:codes="46"

            android:keyLabel="."

            android:popupKeyboard="@xml/popup_punctuation"

            android:keyWidth="10%p"

            android:isModifier="true" />

        <Key

            android:codes="10"

            android:codes="@integer/key_return"

            android:keyIcon="@drawable/sym_keyboard_return"

            android:iconPreview="@drawable/sym_keyboard_feedback_return"

            android:keyWidth="25%p"
@@ -229,7 +202,7 @@ 
        android:rowEdgeFlags="bottom"

    >

        <Key

            android:codes="-2"

            android:codes="@integer/key_symbol"

            android:keyLabel="@string/label_symbol_key"

            android:keyWidth="15%p"

            android:keyEdgeFlags="left"
@@ -245,7 +218,7 @@ 
            android:keyWidth="10%p"

            android:isModifier="true" />

        <Key

            android:codes="32"

            android:codes="@integer/key_space"

            android:keyIcon="@drawable/sym_keyboard_space"

            android:iconPreview="@drawable/sym_keyboard_feedback_space"

            android:keyWidth="30%p"
@@ -257,7 +230,7 @@ 
            android:keyWidth="10%p"

            android:isModifier="true" />

        <Key

            android:codes="10"

            android:codes="@integer/key_return"

            android:keyIcon="@drawable/sym_keyboard_return"

            android:iconPreview="@drawable/sym_keyboard_feedback_return"

            android:keyWidth="25%p"
@@ -269,7 +242,7 @@ 
        android:rowEdgeFlags="bottom"

    >

        <Key

            android:codes="-2"

            android:codes="@integer/key_symbol"

            android:keyLabel="@string/label_symbol_key"

            android:keyWidth="15%p"

            android:keyEdgeFlags="left"
@@ -284,7 +257,7 @@ 
            android:keyLabel="\@"

            android:isModifier="true" />

        <Key

            android:codes="32"

            android:codes="@integer/key_space"

            android:keyIcon="@drawable/sym_keyboard_space"

            android:iconPreview="@drawable/sym_keyboard_feedback_space"

            android:keyWidth="30%p"
@@ -295,7 +268,7 @@ 
            android:popupKeyboard="@xml/popup_punctuation"

            android:isModifier="true" />

        <Key

            android:codes="10"

            android:codes="@integer/key_return"

            android:keyIcon="@drawable/sym_keyboard_return"

            android:iconPreview="@drawable/sym_keyboard_feedback_return"

            android:keyWidth="25%p"
@@ -307,7 +280,7 @@ 
        android:rowEdgeFlags="bottom"

    >

        <Key

            android:codes="-2"

            android:codes="@integer/key_symbol"

            android:keyLabel="@string/label_symbol_key"

            android:keyWidth="15%p"

            android:keyEdgeFlags="left"
@@ -325,14 +298,13 @@ 
            android:keyWidth="10%p"

            android:isModifier="true" />

        <Key

            android:codes="32"

            android:codes="@integer/key_space"

            android:keyIcon="@drawable/sym_keyboard_space"

            android:iconPreview="@drawable/sym_keyboard_feedback_space"

            android:keyWidth="30%p"

            android:isRepeatable="true"

            android:isModifier="true" />

        <Key

            android:codes="46"

            android:keyLabel="."

            android:popupKeyboard="@xml/popup_punctuation"

            android:keyWidth="10%p"
@@ -350,7 +322,7 @@ 
        android:rowEdgeFlags="bottom"

    >

        <Key

            android:codes="-2"

            android:codes="@integer/key_symbol"

            android:keyLabel="@string/label_symbol_key"

            android:keyWidth="15%p"

            android:keyEdgeFlags="left"
@@ -368,14 +340,14 @@ 
            android:keyWidth="10%p"

            android:isModifier="true" />

        <Key

            android:codes="32"

            android:codes="@integer/key_space"

            android:keyIcon="@drawable/sym_keyboard_space"

            android:iconPreview="@drawable/sym_keyboard_feedback_space"

            android:keyWidth="30%p"

            android:isRepeatable="true"

            android:isModifier="true" />

        <Key

            android:codes="9"

            android:codes="@integer/key_tab"

            android:keyIcon="@drawable/sym_keyboard_tab"

            android:iconPreview="@drawable/sym_keyboard_feedback_tab"

            android:keyWidth="10%p"
@@ -386,7 +358,7 @@ 
            android:keyWidth="10%p"

            android:isModifier="true" />

        <Key

            android:codes="10"

            android:codes="@integer/key_return"

            android:keyIcon="@drawable/sym_keyboard_return"

            android:iconPreview="@drawable/sym_keyboard_feedback_return"

            android:keyWidth="15%p"

java/res/xml-da/kbd_qwerty_black.xml

+18 −46
Original line number Diff line number Diff line
@@ -33,50 +33,40 @@ 
>

    <Row>

        <Key

            android:codes="113"

            android:keyLabel="q"

            android:keyWidth="8.75%p"

            android:keyEdgeFlags="left" />

        <Key

            android:codes="119"

            android:keyLabel="w" />

        <Key

            android:codes="101"

            android:keyLabel="e"

            android:popupKeyboard="@xml/kbd_popup_template"

            android:popupCharacters="éèêëę€" />

        <Key

            android:codes="114"

            android:keyLabel="r"

            android:popupKeyboard="@xml/kbd_popup_template"

            android:popupCharacters="ř" />

        <Key

            android:codes="116"

            android:keyLabel="t"

            android:popupKeyboard="@xml/kbd_popup_template"

            android:popupCharacters="ťþ" />

        <Key

            android:codes="121"

            android:keyLabel="y"

            android:popupKeyboard="@xml/kbd_popup_template"

            android:popupCharacters="ýÿü" />

        <Key

            android:codes="117"

            android:keyLabel="u"

            android:popupKeyboard="@xml/kbd_popup_template"

            android:popupCharacters="úùûū" />

        <Key

            android:codes="105"

            android:keyLabel="i"

            android:popupKeyboard="@xml/kbd_popup_template"

            android:popupCharacters="íìîï" />

        <Key

            android:codes="111"

            android:keyLabel="o"

            android:popupKeyboard="@xml/kbd_popup_template"

            android:popupCharacters="óòôõ" />

        <Key

            android:codes="112"

            android:keyLabel="p" />

        <Key

            android:keyLabel="å"
@@ -85,39 +75,30 @@ 
    </Row>

    <Row>

        <Key

            android:codes="97"

            android:keyLabel="a"

            android:popupKeyboard="@xml/kbd_popup_template"

            android:popupCharacters="áàâąã"

            android:keyWidth="8.75%p"

            android:keyEdgeFlags="left" />

        <Key

            android:codes="115"

            android:keyLabel="s"

            android:popupKeyboard="@xml/kbd_popup_template"

            android:popupCharacters="śšşß" />

        <Key

            android:codes="100"

            android:keyLabel="d"

            android:popupKeyboard="@xml/kbd_popup_template"

            android:popupCharacters="ðď" />

        <Key

            android:codes="102"

            android:keyLabel="f" />

        <Key

            android:codes="103"

            android:keyLabel="g" />

        <Key

            android:codes="104"

            android:keyLabel="h" />

        <Key

            android:codes="106"

            android:keyLabel="j" />

        <Key

            android:codes="107"

            android:keyLabel="k" />

        <Key

            android:codes="108"

            android:keyLabel="l"

            android:popupKeyboard="@xml/kbd_popup_template"

            android:popupCharacters="ł" />
@@ -136,7 +117,7 @@ 
        android:keyWidth="10%p"

    >

        <Key

            android:codes="-1"

            android:codes="@integer/key_shift"

            android:keyIcon="@drawable/sym_bkeyboard_shift"

            android:keyWidth="15%p"

            android:isModifier="true"
@@ -144,36 +125,29 @@ 
            android:isSticky="true"

            android:keyEdgeFlags="left" />

        <Key

            android:codes="122"

            android:keyLabel="z"

            android:popupKeyboard="@xml/kbd_popup_template"

            android:popupCharacters="źžż" />

        <Key

            android:codes="120"

            android:keyLabel="x" />

        <Key

            android:codes="99"

            android:keyLabel="c"

            android:popupKeyboard="@xml/kbd_popup_template"

            android:popupCharacters="çćč" />

        <Key

            android:codes="118"

            android:keyLabel="v"

            android:popupKeyboard="@xml/kbd_popup_template"

            android:popupCharacters="w" />

        <Key

            android:codes="98"

            android:keyLabel="b" />

        <Key

            android:codes="110"

            android:keyLabel="n"

            android:popupKeyboard="@xml/kbd_popup_template"

            android:popupCharacters="ńñň" />

        <Key

            android:codes="109"

            android:keyLabel="m" />

        <Key

            android:codes="-5"

            android:codes="@integer/key_delete"

            android:keyIcon="@drawable/sym_bkeyboard_delete"

            android:keyWidth="15%p"

            android:keyEdgeFlags="right"
@@ -185,7 +159,7 @@ 
        android:rowEdgeFlags="bottom"

    >

        <Key

            android:codes="-2"

            android:codes="@integer/key_symbol"

            android:keyLabel="@string/label_symbol_key"

            android:keyWidth="15%p"

            android:keyEdgeFlags="left" />
@@ -200,18 +174,17 @@ 
            android:iconPreview="@drawable/sym_keyboard_feedback_mic"

            android:keyWidth="10%p" />

        <Key

            android:codes="32"

            android:codes="@integer/key_space"

            android:keyIcon="@drawable/sym_bkeyboard_space"

            android:iconPreview="@drawable/sym_keyboard_feedback_space"

            android:keyWidth="30%p"

            android:isRepeatable="true" />

        <Key

            android:codes="46"

            android:keyLabel="."

            android:popupKeyboard="@xml/popup_punctuation"

            android:keyWidth="10%p" />

        <Key

            android:codes="10"

            android:codes="@integer/key_return"

            android:keyIcon="@drawable/sym_bkeyboard_return"

            android:iconPreview="@drawable/sym_keyboard_feedback_return"

            android:keyWidth="25%p"
@@ -222,7 +195,7 @@ 
        android:rowEdgeFlags="bottom"

    >

        <Key

            android:codes="-2"

            android:codes="@integer/key_symbol"

            android:keyLabel="@string/label_symbol_key"

            android:keyWidth="15%p"

            android:keyEdgeFlags="left" />
@@ -235,7 +208,7 @@ 
            android:keyLabel="/"

            android:keyWidth="10%p" />

        <Key

            android:codes="32"

            android:codes="@integer/key_space"

            android:keyIcon="@drawable/sym_bkeyboard_space"

            android:iconPreview="@drawable/sym_keyboard_feedback_space"

            android:keyWidth="30%p"
@@ -245,7 +218,7 @@ 
            android:popupKeyboard="@xml/popup_punctuation"

            android:keyWidth="10%p" />

        <Key

            android:codes="10"

            android:codes="@integer/key_return"

            android:keyIcon="@drawable/sym_bkeyboard_return"

            android:iconPreview="@drawable/sym_keyboard_feedback_return"

            android:keyWidth="25%p"
@@ -256,7 +229,7 @@ 
        android:rowEdgeFlags="bottom"

    >

        <Key

            android:codes="-2"

            android:codes="@integer/key_symbol"

            android:keyLabel="@string/label_symbol_key"

            android:keyWidth="15%p"

            android:keyEdgeFlags="left" />
@@ -268,7 +241,7 @@ 
        <Key

            android:keyLabel="\@" />

        <Key

            android:codes="32"

            android:codes="@integer/key_space"

            android:keyIcon="@drawable/sym_bkeyboard_space"

            android:iconPreview="@drawable/sym_keyboard_feedback_space"

            android:keyWidth="30%p"
@@ -277,7 +250,7 @@ 
            android:keyLabel="."

            android:popupKeyboard="@xml/popup_punctuation" />

        <Key

            android:codes="10"

            android:codes="@integer/key_return"

            android:keyIcon="@drawable/sym_bkeyboard_return"

            android:iconPreview="@drawable/sym_keyboard_feedback_return"

            android:keyWidth="25%p"
@@ -288,7 +261,7 @@ 
        android:rowEdgeFlags="bottom"

    >

        <Key

            android:codes="-2"

            android:codes="@integer/key_symbol"

            android:keyLabel="@string/label_symbol_key"

            android:keyWidth="15%p"

            android:keyEdgeFlags="left" />
@@ -303,13 +276,12 @@ 
            android:iconPreview="@drawable/sym_keyboard_feedback_mic"

            android:keyWidth="10%p" />

        <Key

            android:codes="32"

            android:codes="@integer/key_space"

            android:keyIcon="@drawable/sym_bkeyboard_space"

            android:iconPreview="@drawable/sym_keyboard_feedback_space"

            android:keyWidth="30%p"

            android:isRepeatable="true" />

        <Key

            android:codes="46"

            android:keyLabel="."

            android:popupKeyboard="@xml/popup_punctuation"

            android:keyWidth="10%p" />
@@ -325,7 +297,7 @@ 
        android:rowEdgeFlags="bottom"

    >

        <Key

            android:codes="-2"

            android:codes="@integer/key_symbol"

            android:keyLabel="@string/label_symbol_key"

            android:keyWidth="15%p"

            android:keyEdgeFlags="left" />
@@ -340,13 +312,13 @@ 
            android:iconPreview="@drawable/sym_keyboard_feedback_mic"

            android:keyWidth="10%p" />

        <Key

            android:codes="32"

            android:codes="@integer/key_space"

            android:keyIcon="@drawable/sym_bkeyboard_space"

            android:iconPreview="@drawable/sym_keyboard_feedback_space"

            android:keyWidth="30%p"

            android:isRepeatable="true" />

        <Key

            android:codes="9"

            android:codes="@integer/key_tab"

            android:keyIcon="@drawable/sym_bkeyboard_tab"

            android:iconPreview="@drawable/sym_keyboard_feedback_tab"

            android:keyWidth="10%p" />
@@ -355,7 +327,7 @@ 
            android:popupKeyboard="@xml/popup_punctuation"

            android:keyWidth="10%p" />

        <Key

            android:codes="10"

            android:codes="@integer/key_return"

            android:keyIcon="@drawable/sym_bkeyboard_return"

            android:iconPreview="@drawable/sym_keyboard_feedback_return"

            android:keyWidth="15%p"

java/res/xml-de/kbd_qwerty.xml

100755 → 100644
+16 −45

File changed.File mode changed from 100755 to 100644.

Preview size limit exceeded, changes collapsed.

java/res/xml-de/kbd_qwerty_black.xml

100755 → 100644
+16 −45

File changed.File mode changed from 100755 to 100644.

Preview size limit exceeded, changes collapsed.