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

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

Remove BIDI mirroring hack from Key 

This change also removes isRtlKeyboard attribute from <Keyboard/>

Bug: 5948247
Change-Id: I85998f17ae146a4c8cd0f419ab820b746cb8974f
parent 40e90122

java/res/values-ar/donottranslate-more-keys.xml

+39 −4
Original line number Diff line number Diff line
@@ -102,8 +102,43 @@ 
    <string name="more_keys_for_bullet">♪</string>

    <!-- \u066d: ARABIC FIVE POINTED STAR -->

    <string name="more_keys_for_star">★,\u066d</string>

    <!-- \ufd3e: ORNATE LEFT PARENTHESIS -->

    <string name="more_keys_for_left_parenthesis">[,{,&lt;,\ufd3e</string>

    <!-- \ufd3f: ORNATE RIGHT PARENTHESIS -->

    <string name="more_keys_for_right_parenthesis">],},&gt;,\ufd3f</string>

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

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

    <string name="output_text_for_left_parenthesis">)</string>

    <string name="output_text_for_right_parenthesis">(</string>

    <!-- \ufd3e: ORNATE LEFT PARENTHESIS

         \ufd3f: ORNATE RIGHT PARENTHESIS -->

    <string name="more_keys_for_left_parenthesis">[|],{|},&lt;|&gt;,\ufd3e|\ufd3f</string>

    <string name="more_keys_for_right_parenthesis">]|[,}|{,&gt;|&lt;,\ufd3f|\ufd3e</string>

    <string name="output_text_for_less_than">&gt;</string>

    <string name="output_text_for_greater_than">&lt;</string>

    <!-- \u2264: LESS-THAN OR EQUAL TO

         \u2265: GREATER-THAN EQUAL TO

         \u00ab: LEFT-POINTING DOUBLE ANGLE QUOTATION MARK

         \u00bb: RIGHT-POINTING DOUBLE ANGLE QUOTATION MARK

         \u2039: SINGLE LEFT-POINTING ANGLE QUOTATION MARK

         \u203a: SINGLE RIGHT-POINTING ANGLE QUOTATION MARK

         The following characters don't need BIDI mirroring.

         \u2018: LEFT SINGLE QUOTATION MARK

         \u2019: RIGHT SINGLE QUOTATION MARK

         \u201a: SINGLE LOW-9 QUOTATION MARK

         \u201b: SINGLE HIGH-REVERSED-9 QUOTATION MARK

         \u201c: LEFT DOUBLE QUOTATION MARK

         \u201d: RIGHT DOUBLE QUOTATION MARK

         \u201e: DOUBLE LOW-9 QUOTATION MARK

         \u201f: DOUBLE HIGH-REVERSED-9 QUOTATION MARK -->

    <string name="more_keys_for_less_than">\u2264|\u2265,\u00ab|\u00bb,\u2039|\u203a</string>

    <string name="more_keys_for_greater_than">\u2265|\u2264,\u00bb|\u00ab,\u203a|\u2039</string>

    <string name="output_text_for_left_square_bracket">]</string>

    <string name="output_text_for_right_square_bracket">[</string>

    <string name="output_text_for_left_curly_bracket">}</string>

    <string name="output_text_for_right_curly_bracket">{</string>

    <!-- Note: Neither DroidSans nor Roboto have a glyph for DOUBLE HIGH-REVERSED-9 QUOTATION MARK. -->

    <!-- <string name="more_keys_for_double_quote">\u201c,\u201d,\u201e,\u201f,\u00ab,\u00bb</string> -->

    <!-- The 4-more keys will be displayed in order of "3,1,2,4". -->

    <string name="more_keys_for_double_quote">\u201d,\u00ab|\u00bb,\u201c,\u00bb|\u00ab</string>

    <!-- Note: Neither DroidSans nor Roboto have a glyph for DOUBLE HIGH-REVERSED-9 QUOTATION MARK. -->

    <!-- <string name="more_keys_for_tablet_double_quote">\u201c,\u201d,\u201e,\u201f,\u00ab,\u00bb,\u2018,\u2019,\u201a,\u201b</string> -->

    <!-- The 8-more keys with maxMoreKeysColumn=4 will be displayed in order of "3,1,2,4|7,5,6,8". -->

    <string name="more_keys_for_tablet_double_quote">\u201d,\u00ab|\u00bb,\u201c,\u00bb|\u00ab,\u2019,\u201a,\u2018,\u201b</string>

</resources>

java/res/values-ar/donottranslate.xml

+1 −1
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ 
-->

<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">

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

         http://www.unicode.org/Public/6.0.0/ucd/extracted/DerivedBinaryProperties.txt -->

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

    <!-- Symbols that are suggested between words -->

    <string name="suggested_punctuations">!,?,\\,,:,;,\u0022,(|),)|(,\u0027,-,/,@,_</string>

</resources>

java/res/values-iw/donottranslate-more-keys.xml

+37 −0
Original line number Diff line number Diff line
@@ -20,4 +20,41 @@ 
<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">

    <string name="more_keys_for_star">★</string>

    <string name="more_keys_for_plus">±,﬩</string>

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

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

    <string name="output_text_for_left_parenthesis">)</string>

    <string name="output_text_for_right_parenthesis">(</string>

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

    <string name="more_keys_for_right_parenthesis">]|[,}|{,&gt;|&lt;</string>

    <string name="output_text_for_less_than">&gt;</string>

    <string name="output_text_for_greater_than">&lt;</string>

    <!-- \u2264: LESS-THAN OR EQUAL TO

         \u2265: GREATER-THAN EQUAL TO

         \u00ab: LEFT-POINTING DOUBLE ANGLE QUOTATION MARK

         \u00bb: RIGHT-POINTING DOUBLE ANGLE QUOTATION MARK

         \u2039: SINGLE LEFT-POINTING ANGLE QUOTATION MARK

         \u203a: SINGLE RIGHT-POINTING ANGLE QUOTATION MARK

         The following characters don't need BIDI mirroring.

         \u2018: LEFT SINGLE QUOTATION MARK

         \u2019: RIGHT SINGLE QUOTATION MARK

         \u201a: SINGLE LOW-9 QUOTATION MARK

         \u201b: SINGLE HIGH-REVERSED-9 QUOTATION MARK

         \u201c: LEFT DOUBLE QUOTATION MARK

         \u201d: RIGHT DOUBLE QUOTATION MARK

         \u201e: DOUBLE LOW-9 QUOTATION MARK

         \u201f: DOUBLE HIGH-REVERSED-9 QUOTATION MARK -->

    <string name="more_keys_for_less_than">\u2264|\u2265,\u00ab|\u00bb,\u2039|\u203a</string>

    <string name="more_keys_for_greater_than">\u2265|\u2264,\u00bb|\u00ab,\u203a|\u2039</string>

    <string name="output_text_for_left_square_bracket">]</string>

    <string name="output_text_for_right_square_bracket">[</string>

    <string name="output_text_for_left_curly_bracket">}</string>

    <string name="output_text_for_right_curly_bracket">{</string>

    <!-- Note: Neither DroidSans nor Roboto have a glyph for DOUBLE HIGH-REVERSED-9 QUOTATION MARK. -->

    <!-- <string name="more_keys_for_double_quote">\u201c,\u201d,\u201e,\u201f,\u00ab,\u00bb</string> -->

    <!-- The 4-more keys will be displayed in order of "3,1,2,4". -->

    <string name="more_keys_for_double_quote">\u201d,\u00ab|\u00bb,\u201c,\u00bb|\u00ab</string>

    <!-- Note: Neither DroidSans nor Roboto have a glyph for DOUBLE HIGH-REVERSED-9 QUOTATION MARK. -->

    <!-- <string name="more_keys_for_tablet_double_quote">\u201c,\u201d,\u201e,\u201f,\u00ab,\u00bb,\u2018,\u2019,\u201a,\u201b</string> -->

    <!-- The 8-more keys with maxMoreKeysColumn=4 will be displayed in order of "3,1,2,4|7,5,6,8". -->

    <string name="more_keys_for_tablet_double_quote">\u201d,\u00ab|\u00bb,\u201c,\u00bb|\u00ab,\u2019,\u201a,\u2018,\u201b</string>

</resources>

java/res/values-iw/donottranslate.xml

+1 −1
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ 
-->

<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">

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

         http://www.unicode.org/Public/6.0.0/ucd/extracted/DerivedBinaryProperties.txt -->

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

    <!-- Symbols that are suggested between words -->

    <string name="suggested_punctuations">!,?,\\,,:,;,\u0022,(|),)|(,\u0027,-,/,@,_</string>

</resources>

java/res/values/attrs.xml

+0 −2
Original line number Diff line number Diff line
@@ -202,8 +202,6 @@ 
        <attr name="verticalGap" format="dimension|fraction" />

        <!-- More keys keyboard layout template -->

        <attr name="moreKeysTemplate" format="reference" />

        <!-- True if the keyboard is Right-To-Left -->

        <attr name="isRtlKeyboard" format="boolean" />

        <!-- Icon set for key top and key preview. -->

        <attr name="iconShiftKey" format="reference" />

        <attr name="iconDeleteKey" format="reference" />