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

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

Revert back punctuations to the more keys keyboard of the period 

Cherry-pick I157164910f from Master.

Bug: 11621857
Change-Id: I0fd0496e9091165280f34b4640ff0e524e3847b9
parent 7505290c

java/res/xml/key_nepali_traditional_period.xml

+2 −1
Original line number Diff line number Diff line
@@ -39,10 +39,11 @@ 
                 set of Key definitions are needed based on the API version. -->

            <include

                latin:keyboardLayout="@xml/keystyle_devanagari_sign_virama" />

            <!-- U+002E: "." FULL STOP -->

            <Key

                latin:keyStyle="baseKeyDevanagariSignVirama"

                latin:keyLabelFlags="hasPopupHint"

                latin:moreKeys="!fixedColumnOrder!4,.,!text/more_keys_for_punctuation"

                latin:moreKeys="!fixedColumnOrder!9,&#x002E;,!text/more_keys_for_punctuation"

                latin:backgroundType="functional" />

        </default>

    </switch>

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

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

        /* 51 */ "$",

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

        /* 53 */ "!fixedColumnOrder!4,#,!,\\,,?,-,:,',@",

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

        // U+2020: "†" DAGGER

        // U+2021: "‡" DOUBLE DAGGER

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

        /* ~52 */

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

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

        /* 53 */ "!fixedColumnOrder!9,;,/,(,),#,\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,
@@ -1935,7 +1935,7 @@ public final class KeyboardTextsSet { 
        // U+20AA: "₪" NEW SHEQEL SIGN

        /* 51 */ "\u20AA",

        /* 52 */ null,

        /* 53 */ null,

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

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

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

    <string name="more_keys_for_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-iw/donottranslate-more-keys.xml

+1 −0
Original line number Diff line number Diff line
@@ -28,6 +28,7 @@ 
    <!-- U+00B1: "±" PLUS-MINUS SIGN

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

    <string name="more_keys_for_plus">&#x00B1;,&#xFB29;</string>

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

    <!-- The all letters need to be mirrored are found at

         http://www.unicode.org/Public/6.1.0/ucd/BidiMirroring.txt -->

    <string name="more_keys_for_left_parenthesis">!fixedColumnOrder!3,&lt;|&gt;,{|},[|]</string>

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!4,#,!,\\,,\?,-,:,',\@"</string>

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

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

         U+2021: "‡" DOUBLE DAGGER

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