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

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

Merge "Reduce the number of more keys of the period key"

parents 41745c49 85d9b3c2

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

+4 −4
Original line number Diff line number Diff line
@@ -275,7 +275,7 @@ public final class KeyboardTextsSet { 
        /* 50 */ "\u00A2,\u00A3,\u20AC,\u00A5,\u20B1",

        /* 51 */ "$",

        /* 52 */ "$,\u00A2,\u20AC,\u00A3,\u00A5,\u20B1",

        /* 53 */ "!fixedColumnOrder!8,\",\',#,-,:,!,\\,,?,@,&,\\%,+,;,/,(,)",

        /* 53 */ "\\,,?,!,;,@,:",

        // U+2020: "†" DAGGER

        // U+2021: "‡" DOUBLE DAGGER

        // U+2605: "★" BLACK STAR
@@ -775,7 +775,7 @@ public final class KeyboardTextsSet { 
        null, null, null, null, null, null, null, null,

        /* ~52 */

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

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

        /* 53 */ "\\,,?,!,\u00B7,;,@,:",

        /* 54~ */

        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,
@@ -1247,7 +1247,7 @@ public final class KeyboardTextsSet { 
        /* ~52 */

        // U+00A1: "¡" INVERTED EXCLAMATION MARK

        // U+00BF: "¿" INVERTED QUESTION MARK

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

        /* 53 */ "!fixedColumnOrder!4,;,!,\\,,?,:,\u00A1,@,\u00BF",

        /* 54~ */

        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,
@@ -1894,7 +1894,7 @@ public final class KeyboardTextsSet { 
        // U+20AA: "₪" NEW SHEQEL SIGN

        /* 51 */ "\u20AA",

        /* 52 */ null,

        /* 53 */ "!fixedColumnOrder!8,\",\',#,-,:,!,\\,,?,@,&,\\%,+,;,/,(|),)|(",

        /* 53 */ null,

        // U+2605: "★" BLACK STAR

        /* 54 */ "\u2605",

        /* 55 */ null,

tools/make-keyboard-text/res/values-ca/donottranslate-more-keys.xml

+1 −1
Original line number Diff line number Diff line
@@ -71,7 +71,7 @@ 
         U+0142: "ł" LATIN SMALL LETTER L WITH STROKE -->

    <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_punctuation">"\\,,\?,!,&#x00B7;,;,\@,:"</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>

tools/make-keyboard-text/res/values-es/donottranslate-more-keys.xml

+1 −1
Original line number Diff line number Diff line
@@ -71,7 +71,7 @@ 
    <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>

    <string name="more_keys_for_punctuation">"!fixedColumnOrder!4,;,!,\\,,\?,:,&#x00A1;,\@,&#x00BF;"</string>

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

    <string name="more_keys_for_tablet_comma">"!,&#x00A1;"</string>

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

tools/make-keyboard-text/res/values-iw/donottranslate-more-keys.xml

+0 −1
Original line number Diff line number Diff line
@@ -23,7 +23,6 @@ 
         U+05D1: "ב" HEBREW LETTER BET

         U+05D2: "ג" HEBREW LETTER GIMEL -->

    <string name="label_to_alpha_key">&#x05D0;&#x05D1;&#x05D2;</string>

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

    <!-- U+2605: "★" BLACK STAR -->

    <string name="more_keys_for_star">&#x2605;</string>

    <!-- U+FB29: "﬩" HEBREW LETTER ALTERNATIVE PLUS SIGN -->

tools/make-keyboard-text/res/values/donottranslate-more-keys.xml

+1 −1
Original line number Diff line number Diff line
@@ -77,7 +77,7 @@ 
    <string name="more_keys_for_currency_dollar">&#x00A2;,&#x00A3;,&#x20AC;,&#x00A5;,&#x20B1;</string>

    <string name="keylabel_for_currency">$</string>

    <string name="more_keys_for_currency">$,&#x00A2;,&#x20AC;,&#x00A3;,&#x00A5;,&#x20B1;</string>

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

    <string name="more_keys_for_punctuation">"\\,,\?,!,;,\@,:"</string>

    <!-- U+2020: "†" DAGGER

         U+2021: "‡" DOUBLE DAGGER

         U+2605: "★" BLACK STAR -->