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

Commit 2e9d50a9 authored by Jean-Baptiste Queru's avatar Jean-Baptiste Queru Committed by Gerrit Code Review
Browse files

Merge "Fix Catalan keyboard layout"

parents 2f387da0 e1d3efe5

java/res/xml-sw600dp/rowkeys_symbols2.xml

+3 −2
Original line number Diff line number Diff line
@@ -62,10 +62,11 @@ 
        latin:keyLabel="*"

        latin:moreKeys="!text/more_keys_for_star" />

    <!-- U+2013: "–" EN DASH

         U+2014: "—" EM DASH -->

         U+2014: "—" EM DASH

         U+00B7: "·" MIDDLE DOT -->

    <Key

        latin:keyLabel="-"

        latin:moreKeys="_,&#x2013;,&#x2014;" />

        latin:moreKeys="_,&#x2013;,&#x2014;,&#x00B7;" />

    <Key

        latin:keyLabel="+"

        latin:moreKeys="!text/more_keys_for_plus" />

java/res/xml/rowkeys_symbols2.xml

+3 −2
Original line number Diff line number Diff line
@@ -54,10 +54,11 @@ 
        latin:keyLabel="*"

        latin:moreKeys="!text/more_keys_for_star" />

    <!-- U+2013: "–" EN DASH

         U+2014: "—" EM DASH -->

         U+2014: "—" EM DASH

         U+00B7: "·" MIDDLE DOT -->

    <Key

        latin:keyLabel="-"

        latin:moreKeys="_,&#x2013;,&#x2014;" />

        latin:moreKeys="_,&#x2013;,&#x2014;,&#x00B7;" />

    <Key

        latin:keyLabel="+"

        latin:moreKeys="!text/more_keys_for_plus" />

java/src/com/android/inputmethod/keyboard/internal/KeyboardTextsSet.java

+27 −4
Original line number Diff line number Diff line
@@ -371,8 +371,7 @@ public final class KeyboardTextsSet { 
        /* 112 */ "w",

        /* 113 */ "y",

        /* 114 */ "x",

        // U+00F1: "ñ" LATIN SMALL LETTER N WITH TILDE

        /* 115 */ "\u00F1",

        /* 115 */ EMPTY,

        /* 116 */ "!fixedColumnOrder!2,!hasLabels!,!text/label_time_am,!text/label_time_pm",

        /* 117 */ "!icon/settings_key|!code/key_settings",

        /* 118 */ "!icon/shortcut_key|!code/key_shortcut",
@@ -728,9 +727,28 @@ public final class KeyboardTextsSet { 
        /* 8~ */

        null, null, null, null, null, null,

        /* ~13 */

        // U+0140: "ŀ" LATIN SMALL LETTER L WITH MIDDLE DOT

        // U+00B7: "·" MIDDLE DOT

        // U+0142: "ł" LATIN SMALL LETTER L WITH STROKE

        /* 14 */ "\u0140,\u0142",

        /* 14 */ "l\u00B7l,\u0142",

        /* 15~ */

        null, null, null, null, null, null, null, null, null, null, null, null, null, null, null,

        null, null, null, null, null, null, null, null, null, null, null, null, null, null, null,

        null, null, null, null, null,

        /* ~49 */

        // U+00B7: "·" MIDDLE DOT

        /* 50 */ "!fixedColumnOrder!9,\u00B7,\",\',#,-,:,!,\\,,?,@,&,\\%,+,;,/,(,)",

        /* 51~ */

        null, null, null, null, null, null, null, null, null, null, null, null, null, null, null,

        null, null, null, null, null, null, null, null, null, null, null, null, null, null, null,

        null, null, null, null, null, null, null, null, null, null, null, null, null, null, null,

        null, null, null, null, null, null, null, null, null,

        /* ~104 */

        /* 105 */ "?,\u00B7",

        /* 106~ */

        null, null, null, null, null, null, null, null, null,

        /* ~114 */

        // U+00E7: "ç" LATIN SMALL LETTER C WITH CEDILLA

        /* 115 */ "\u00E7",

    };



    /* Language cs: Czech */
@@ -1203,6 +1221,11 @@ public final class KeyboardTextsSet { 
        /* 106 */ "\"",

        /* 107 */ "\'",

        /* 108 */ "\'",

        /* 109~ */

        null, null, null, null, null, null,

        /* ~114 */

        // U+00F1: "ñ" LATIN SMALL LETTER N WITH TILDE

        /* 115 */ "\u00F1",

    };



    /* Language et: Estonian */

tools/maketext/res/values-ca/donottranslate-more-keys.xml

+7 −2
Original line number Diff line number Diff line
@@ -67,7 +67,12 @@ 
         U+0107: "ć" LATIN SMALL LETTER C WITH ACUTE

         U+010D: "č" LATIN SMALL LETTER C WITH CARON -->

    <string name="more_keys_for_c">&#x00E7;,&#x0107;,&#x010D;</string>

    <!-- U+0140: "ŀ" LATIN SMALL LETTER L WITH MIDDLE DOT

    <!-- U+00B7: "·" MIDDLE DOT

         U+0142: "ł" LATIN SMALL LETTER L WITH STROKE -->

    <string name="more_keys_for_l">&#x0140;,&#x0142;</string>

    <string name="more_keys_for_l">l&#x00B7;l,&#x0142;</string>

    <!-- U+00B7: "·" MIDDLE DOT -->

    <string name="more_keys_for_punctuation">"!fixedColumnOrder!9,&#x00B7;,\",\',#,-,:,!,\\,,\?,\@,&amp;,\\%,+,;,/,(,)"</string>

    <string name="more_keys_for_tablet_period">\?,&#x00B7;</string>

    <!-- U+00E7: "ç" LATIN SMALL LETTER C WITH CEDILLA -->

    <string name="keylabel_for_spanish_row2_10">&#x00E7;</string>

</resources>

tools/maketext/res/values-es/donottranslate-more-keys.xml

+2 −0
Original line number Diff line number Diff line
@@ -67,6 +67,8 @@ 
         U+0107: "ć" LATIN SMALL LETTER C WITH ACUTE

         U+010D: "č" LATIN SMALL LETTER C WITH CARON -->

    <string name="more_keys_for_c">&#x00E7;,&#x0107;,&#x010D;</string>

    <!-- U+00F1: "ñ" LATIN SMALL LETTER N WITH TILDE -->

    <string name="keylabel_for_spanish_row2_10">&#x00F1;</string>

    <!-- U+00A1: "¡" INVERTED EXCLAMATION MARK

         U+00BF: "¿" INVERTED QUESTION MARK -->

    <string name="more_keys_for_punctuation">"!fixedColumnOrder!9,&#x00A1;,\",\',#,-,:,!,\\,,\?,&#x00BF;,\@,&amp;,\\%,+,;,/,(,)"</string>