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

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

Merge "Fix quotation marks"

parents a6581a20 717cef79

java/res/xml-xlarge/kbd_symbols.xml

+2 −1
Original line number Diff line number Diff line
@@ -211,9 +211,10 @@ 
                    latin:keyLabel="-" />

            </case>

            <default>

                <!-- Note: DroidSans doesn't have double-high-reversed-quotation '\u201f' glyph. -->

                <Key

                    latin:keyLabel="&quot;"

                    latin:popupCharacters="“,”,«,»,˝" />

                    latin:popupCharacters="“,”,„,‟,«,»,‘,’,‚,‛" />

                <Key

                    latin:keyLabel="_" />

            </default>

java/res/xml-xlarge/kbd_symbols_shift.xml

+2 −1
Original line number Diff line number Diff line
@@ -99,7 +99,8 @@ 
            latin:popupCharacters="↑,↓,←,→" />

        <Key

            latin:keyStyle="nonPasswordSymbolKeyStyle"

            latin:keyLabel="°" />

            latin:keyLabel="°"

            latin:popupCharacters="′,″" />

        <Key

            latin:keyStyle="nonPasswordSymbolKeyStyle"

            latin:keyLabel="±"

java/res/xml/kbd_key_styles.xml

+23 −0
Original line number Diff line number Diff line
@@ -312,4 +312,27 @@ 
        latin:popupCharacters="@string/alternates_for_smiley"

        latin:maxPopupKeyboardColumn="5"

        latin:parentStyle="functionalKeyStyle" />

    <switch>

        <case

            latin:passwordInput="true"

        >

            <key-style

                latin:styleName="nonPasswordSymbolKeyStyle"

                latin:enabled="false" />

            <key-style

                latin:styleName="nonPasswordFunctionalKeyStyle"

                latin:enabled="false"

                latin:parentStyle="functionalKeyStyle" />

        </case>

        <!-- latin:passwordInput="false" -->

        <default>

            <key-style

                latin:styleName="nonPasswordSymbolKeyStyle"

                latin:enabled="true" />

            <key-style

                latin:styleName="nonPasswordFunctionalKeyStyle"

                latin:enabled="true"

                latin:parentStyle="functionalKeyStyle" />

        </default>

    </switch>

</merge>
 
 No newline at end of file

java/res/xml/kbd_symbols.xml

+4 −2
Original line number Diff line number Diff line
@@ -105,12 +105,14 @@ 
        <Key

            latin:keyLabel="!"

            latin:popupCharacters="¡" />

        <!-- Note: DroidSans doesn't have double-high-reversed-quotation '\u201f' glyph. -->

        <Key

            latin:keyLabel="&quot;"

            latin:popupCharacters="“,”,«,»,˝" />

            latin:popupCharacters="“,”,„,‟,«,»"

            latin:maxPopupKeyboardColumn="6" />

        <Key

            latin:keyLabel="\'"

            latin:popupCharacters="‘,’" />

            latin:popupCharacters="‘,’,‚,‛,´" />

        <Key

            latin:keyLabel=":" />

        <Key

java/res/xml/kbd_symbols_shift.xml

+15 −1
Original line number Diff line number Diff line
@@ -42,16 +42,21 @@ 
        <Key

            latin:keyLabel="|" />

        <Key

            latin:keyStyle="nonPasswordSymbolKeyStyle"

            latin:keyLabel="•"

            latin:popupCharacters="♪,♥,♠,♦,♣" />

        <Key

            latin:keyStyle="nonPasswordSymbolKeyStyle"

            latin:keyLabel="√" />

        <Key

            latin:keyStyle="nonPasswordSymbolKeyStyle"

            latin:keyLabel="π"

            latin:popupCharacters="Π" />

        <Key

            latin:keyStyle="nonPasswordSymbolKeyStyle"

            latin:keyLabel="÷" />

        <Key

            latin:keyStyle="nonPasswordSymbolKeyStyle"

            latin:keyLabel="×" />

        <Key

            latin:keyLabel="{" />
@@ -64,13 +69,18 @@ 
            latin:keyStyle="nonSpecialBackgroundTabKeyStyle"

            latin:keyEdgeFlags="left" />

        <Key

            latin:keyStyle="nonPasswordSymbolKeyStyle"

            latin:keyLabel="£" />

        <Key

            latin:keyStyle="nonPasswordSymbolKeyStyle"

            latin:keyLabel="¢" />

        <Key

            latin:keyStyle="nonPasswordSymbolKeyStyle"

            latin:keyLabel="€" />

        <Key

            latin:keyLabel="°" />

            latin:keyStyle="nonPasswordSymbolKeyStyle"

            latin:keyLabel="°"

            latin:popupCharacters="′,″" />

        <Key

            latin:keyLabel="^"

            latin:popupCharacters="↑,↓,←,→" />
@@ -92,12 +102,16 @@ 
            latin:visualInsetsRight="1%p"

            latin:keyEdgeFlags="left" />

        <Key

            latin:keyStyle="nonPasswordSymbolKeyStyle"

            latin:keyLabel="™" />

        <Key

            latin:keyStyle="nonPasswordSymbolKeyStyle"

            latin:keyLabel="®" />

        <Key

            latin:keyStyle="nonPasswordSymbolKeyStyle"

            latin:keyLabel="©" />

        <Key

            latin:keyStyle="nonPasswordSymbolKeyStyle"

            latin:keyLabel="¶"

            latin:popupCharacters="§" />

        <Key