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

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

Language dependent single/doule quotation more keys 

The natural way of marking quoted text vary from language to
language. This change introduces the following variations.

* LEFT and RIGHT quotations (English etc.)
* LOW-9 and LEFT quotations (German etc.)
* LOW-9 and RIGHT quotations (Dutch etc.)
* RIGHT and RIGHT quotations (Swedish etc.)
* LEFT ANGLE and RIGHT ANGLE quotations (French etc.)
* RIGHT ANGLE and LEFT ANGLE quotations

Bug: 8356419
Change-Id: I75726ab7ed783d02f189b46236c9d5079737bcff
parent 998a1748

java/res/xml-sw600dp/keys_pcqwerty3_right2.xml

+2 −22
Original line number Diff line number Diff line
@@ -28,19 +28,9 @@ 
            <Key

                latin:keyLabel=";"

                latin:moreKeys=":" />

            <!-- U+2018: "‘" LEFT SINGLE QUOTATION MARK

                 U+2019: "’" RIGHT SINGLE QUOTATION MARK

                 U+201A: "‚" SINGLE LOW-9 QUOTATION MARK

                 U+201B: "‛" SINGLE HIGH-REVERSED-9 QUOTATION MARK

                 U+201C: "“" LEFT DOUBLE QUOTATION MARK

                 U+201D: "”" RIGHT DOUBLE QUOTATION MARK

                 U+201E: "„" DOUBLE LOW-9 QUOTATION MARK

                 U+201F: "‟" DOUBLE HIGH-REVERSED-9 QUOTATION MARK -->

            <!-- TODO: Neither DroidSans nor Roboto have the glyph for U+201F DOUBLE HIGH-REVERSED-9 QUOTATION MARK.

                 moreKeys="!fixedColumnOrder!4,&#x201C;,&#x201D;,&#x201E;,&#x201F;,&#x2018;,&#x2019;,&#x201A;,&#x201B;" -->

            <Key

                latin:keyLabel="\'"

                latin:moreKeys="!fixedColumnOrder!4,&#x201C;,&#x201D;,&#x2018;,&#x2019;,&#x201A;,&#x201B;,&quot;" />

                latin:moreKeys="!fixedColumnOrder!3,!text/double_quotes,!text/single_quotes" />

        </case>

        <default>

            <Key
@@ -48,20 +38,10 @@ 
                latin:keyHintLabel=":"

                latin:moreKeys=":"

                latin:keyStyle="hasShiftedLetterHintStyle" />

            <!-- U+2018: "‘" LEFT SINGLE QUOTATION MARK

                 U+2019: "’" RIGHT SINGLE QUOTATION MARK

                 U+201A: "‚" SINGLE LOW-9 QUOTATION MARK

                 U+201B: "‛" SINGLE HIGH-REVERSED-9 QUOTATION MARK

                 U+201C: "“" LEFT DOUBLE QUOTATION MARK

                 U+201D: "”" RIGHT DOUBLE QUOTATION MARK

                 U+201E: "„" DOUBLE LOW-9 QUOTATION MARK

                 U+201F: "‟" DOUBLE HIGH-REVERSED-9 QUOTATION MARK -->

            <!-- TODO: Neither DroidSans nor Roboto have the glyph for U+201F DOUBLE HIGH-REVERSED-9 QUOTATION MARK.

                 moreKeys="!fixedColumnOrder!4,&#x201C;,&#x201D;,&#x201E;,&#x201F;,&#x2018;,&#x2019;,&#x201A;,&#x201B;" -->

            <Key

                latin:keyLabel="\'"

                latin:keyHintLabel="&quot;"

                latin:moreKeys="!fixedColumnOrder!4,&#x201C;,&#x201D;,&#x2018;,&#x2019;,&#x201A;,&#x201B;,&quot;"

                latin:moreKeys="!fixedColumnOrder!4,!text/double_quotes,&quot;,!text/single_quotes"

                latin:keyStyle="hasShiftedLetterHintStyle" />

        </default>

    </switch>

java/res/xml/keys_pcqwerty3_right2.xml

+2 −12
Original line number Diff line number Diff line
@@ -30,25 +30,15 @@ 
                latin:moreKeys=":" />

            <Key

                latin:keyLabel="\'"

                latin:moreKeys="&quot;" />

                latin:moreKeys="!fixedColumnOrder!4,!text/double_quotes,&quot;,!text/single_quotes" />

        </case>

        <!-- keyboardLayoutSetElement="alphabet*Shifted|symbols*" -->

        <default>

            <Key

                latin:keyLabel=":" />

            <!-- U+2018: "‘" LEFT SINGLE QUOTATION MARK

                 U+2019: "’" RIGHT SINGLE QUOTATION MARK

                 U+201A: "‚" SINGLE LOW-9 QUOTATION MARK

                 U+201B: "‛" SINGLE HIGH-REVERSED-9 QUOTATION MARK

                 U+201C: "“" LEFT DOUBLE QUOTATION MARK

                 U+201D: "”" RIGHT DOUBLE QUOTATION MARK

                 U+201E: "„" DOUBLE LOW-9 QUOTATION MARK

                 U+201F: "‟" DOUBLE HIGH-REVERSED-9 QUOTATION MARK -->

            <!-- TODO: Neither DroidSans nor Roboto have the glyph for U+201F DOUBLE HIGH-REVERSED-9 QUOTATION MARK.

                 moreKeys="!fixedColumnOrder!4,&#x201C;,&#x201D;,&#x201E;,&#x201F;,&#x2018;,&#x2019;,&#x201A;,&#x201B;" -->

            <Key

                latin:keyLabel="&quot;"

                latin:moreKeys="!fixedColumnOrder!4,&#x201C;,&#x201D;,&#x2018;,&#x2019;,&#x201A;,&#x201B;" />

                latin:moreKeys="!fixedColumnOrder!3,!text/double_quotes,!text/single_quotes" />

        </default>

    </switch>

</merge>

java/res/xml/row_symbols_shift4.xml

+3 −5
Original line number Diff line number Diff line
@@ -27,13 +27,11 @@ 
        <Key

            latin:keyStyle="toAlphaKeyStyle"

            latin:keyWidth="15%p" />

        <!-- U+201F: "‟" DOUBLE HIGH-REVERSED-9 QUOTATION MARK -->

        <!-- TODO: Neither DroidSans nor Roboto have the glyph for U+201F DOUBLE HIGH-REVERSED-9 QUOTATION MARK. -->

        <!-- latin:keyLabelFlags="hasPopupHint" -->

        <!-- latin:moreKeys="&#x201F;" -->

        <!-- U+201E: "„" DOUBLE LOW-9 QUOTATION MARK -->

        <!-- U+201A: "‚" SINGLE LOW-9 QUOTATION MARK

             U+201E: "„" DOUBLE LOW-9 QUOTATION MARK -->

        <Key

            latin:keyLabel="&#x201E;"

            latin:moreKeys="&#x201A;"

            latin:backgroundType="functional" />

        <include

            latin:keyXPos="25%p"

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

+540 −440

File changed.

Preview size limit exceeded, changes collapsed.

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

+3 −23
Original line number Diff line number Diff line
@@ -99,31 +99,11 @@ 
         U+00AB: "«" LEFT-POINTING DOUBLE ANGLE QUOTATION MARK

         U+00BB: "»" RIGHT-POINTING DOUBLE ANGLE QUOTATION MARK

         U+2039: "‹" SINGLE LEFT-POINTING ANGLE QUOTATION MARK

         U+203A: "›" SINGLE RIGHT-POINTING ANGLE QUOTATION MARK

         The following characters don't need BIDI mirroring.

         U+2018: "‘" LEFT SINGLE QUOTATION MARK

         U+2019: "’" RIGHT SINGLE QUOTATION MARK

         U+201A: "‚" SINGLE LOW-9 QUOTATION MARK

         U+201B: "‛" SINGLE HIGH-REVERSED-9 QUOTATION MARK

         U+201C: "“" LEFT DOUBLE QUOTATION MARK

         U+201D: "”" RIGHT DOUBLE QUOTATION MARK

         U+201E: "„" DOUBLE LOW-9 QUOTATION MARK

         U+201F: "‟" DOUBLE HIGH-REVERSED-9 QUOTATION MARK -->

         U+203A: "›" SINGLE RIGHT-POINTING ANGLE QUOTATION MARK -->

    <string name="more_keys_for_less_than">!fixedColumnOrder!3,&#x2039;|&#x203A;,&#x2264;|&#x2265;,&#x00AB;|&#x00BB;</string>

    <string name="more_keys_for_greater_than">!fixedColumnOrder!3,&#x203A;|&#x2039;,&#x2265;|&#x2264;,&#x00BB;|&#x00AB;</string>

    <!-- TODO: Neither DroidSans nor Roboto have the glyph for U+201F DOUBLE HIGH-REVERSED-9 QUOTATION MARK -->

    <!-- <string name="more_keys_for_double_quote">&#x201C;,&#x201D;,&#x201E;,&#x201F;,&#x00AB;|&#x00BB;,&#x00BB;|&#x00AB;</string> -->

    <string name="more_keys_for_double_quote">!fixedColumnOrder!4,&#x201C;,&#x201D;,&#x00AB;|&#x00BB;,&#x00BB;|&#x00AB;</string>

    <!-- TODO: Neither DroidSans nor Roboto have the glyph for U+201F DOUBLE HIGH-REVERSED-9 QUOTATION MARK -->

    <!-- <string name="more_keys_for_tablet_double_quote">!fixedColumnOrder!6,&#x201C;,&#x201D;,&#x201E;,&#x201F;,&#x00AB;|&#x00BB;,&#x00BB|&#x00AB;;,&#x2018;,&#x2019;,&#x201A;,&#x201B;</string> -->

    <string name="more_keys_for_tablet_double_quote">!fixedColumnOrder!4,&#x201C;,&#x201D;,&#x00AB;|&#x00BB;,&#x00BB;|&#x00AB;,&#x2018;,&#x2019;,&#x201A;,&#x201B;</string>

    <!-- U+00A2: "¢" CENT SIGN

         U+00A3: "£" POUND SIGN

         U+20AC: "€" EURO SIGN

         U+00A5: "¥" YEN SIGN

         U+20B1: "₱" PESO SIGN

         U+FDFC: "﷼" RIAL SIGN -->

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

    <string name="single_angle_quotes">!text/single_laqm_raqm_rtl</string>

    <string name="double_angle_quotes">!text/double_laqm_raqm_rtl</string>

    <!-- U+0655: "ٕ" ARABIC HAMZA BELOW

         U+0654: "ٔ" ARABIC HAMZA ABOVE

         U+0652: "ْ" ARABIC SUKUN