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

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

Fix test resource declarations and parsing a bit 

Change-Id: I882a41b2934c48f4405f1ea5bf4d6ad41e87322c
parent d4469756

java/res/xml-sw600dp/key_styles_common.xml

+1 −1
Original line number Diff line number Diff line
@@ -161,7 +161,7 @@ 
        latin:parentStyle="baseForLayoutSwitchKeyStyle" />

    <key-style

        latin:styleName="comKeyStyle"

        latin:keySpec="!text/keylabel_for_popular_domain|!text/keylabel_for_popular_domain"

        latin:keySpec="!text/keylabel_for_popular_domain"

        latin:keyLabelFlags="autoXScale|fontNormal|hasPopupHint|preserveCase"

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

</merge>

java/res/xml/key_styles_common.xml

+1 −1
Original line number Diff line number Diff line
@@ -149,7 +149,7 @@ 
        latin:parentStyle="baseForLayoutSwitchKeyStyle" />

    <key-style

        latin:styleName="comKeyStyle"

        latin:keySpec="!text/keylabel_for_popular_domain|!text/keylabel_for_popular_domain"

        latin:keySpec="!text/keylabel_for_popular_domain"

        latin:keyLabelFlags="autoXScale|fontNormal|hasPopupHint|preserveCase"

        latin:moreKeys="!text/more_keys_for_popular_domain"

        latin:backgroundType="functional" />

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

+2 −2
Original line number Diff line number Diff line
@@ -75,7 +75,7 @@ 
    <!-- U+066A: "٪" ARABIC PERCENT SIGN -->

    <string name="keylabel_for_symbols_percent">&#x066A;</string>

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

    <string name="more_keys_for_question">\?,&#x00BF;</string>

    <string name="more_keys_for_question">?,&#x00BF;</string>

    <string name="more_keys_for_symbols_semicolon">;</string>

    <!-- U+2030: "‰" PER MILLE SIGN -->

    <string name="more_keys_for_symbols_percent">\\%,&#x2030;</string>
@@ -85,7 +85,7 @@ 
    <string name="keylabel_for_tablet_comma">"&#x060C;"</string>

    <string name="keyhintlabel_for_tablet_comma">"&#x061F;"</string>

    <string name="more_keys_for_tablet_comma">"!fixedColumnOrder!4,:,!,&#x061F;,&#x061B;,-,/,\",\'"</string>

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

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

    <!-- U+266A: "♪" EIGHTH NOTE -->

    <string name="more_keys_for_bullet">&#x266A;</string>

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

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

+2 −2
Original line number Diff line number Diff line
@@ -71,8 +71,8 @@ 
         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_tablet_punctuation">"!fixedColumnOrder!8,;,/,(,),#,&#x00B7;,',\\,,&amp;,\\%,+,\",-,:,\@"</string>

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

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

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

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

</resources>

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

+1 −1
Original line number Diff line number Diff line
@@ -69,5 +69,5 @@ 
    <string name="more_keys_for_c">&#x00E7;,&#x0107;,&#x010D;</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!9,&#x00A1;,;,/,(,),#,!,\\,,?,&#x00BF;,&amp;,\\%,+,\",-,:,',@"</string>

</resources>