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

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

Merge "Fix symbol letter size of phone/number layout"

parents b9ba5fc7 981d465d

java/res/xml-sw600dp/rows_number_normal.xml

+16 −12
Original line number Diff line number Diff line
@@ -24,17 +24,17 @@ 
    <Row>

        <Key

            latin:keySpec="-"

            latin:keyStyle="numKeyStyle"

            latin:keyStyle="numSymbolKeyStyle"

            latin:keyWidth="10%p"

            latin:backgroundType="functional" />

        <Key

            latin:keySpec="+"

            latin:keyStyle="numKeyStyle"

            latin:keyStyle="numSymbolKeyStyle"

            latin:keyWidth="10%p"

            latin:backgroundType="functional" />

        <Key

            latin:keySpec="."

            latin:keyStyle="numKeyStyle"

            latin:keyStyle="numSymbolKeyStyle"

            latin:keyWidth="10%p"

            latin:backgroundType="functional" />

        <Key
@@ -53,13 +53,15 @@ 
            latin:keyWidth="fillRight" />

    </Row>

    <Row>

        <!-- U+FF0A: "＊" FULLWIDTH ASTERISK -->

        <Key

            latin:keyStyle="numStarKeyStyle"

            latin:keySpec="&#xFF0A;|*"

            latin:keyStyle="numSymbolKeyStyle"

            latin:keyWidth="10%p"

            latin:backgroundType="functional" />

        <Key

            latin:keySpec="/"

            latin:keyStyle="numKeyStyle"

            latin:keyStyle="numSymbolKeyStyle"

            latin:keyWidth="10%p"

            latin:backgroundType="functional" />

        <switch>
@@ -70,14 +72,14 @@ 
                    latin:keySpec=","

                    latin:keyLabelFlags="hasPopupHint"

                    latin:moreKeys="!text/morekeys_am_pm"

                    latin:keyStyle="numKeyStyle"

                    latin:keyStyle="numSymbolKeyStyle"

                    latin:keyWidth="10%p"

                    latin:backgroundType="functional" />

            </case>

            <default>

                <Key

                    latin:keySpec=","

                    latin:keyStyle="numKeyStyle"

                    latin:keyStyle="numSymbolKeyStyle"

                    latin:keyWidth="10%p"

                    latin:backgroundType="functional" />

            </default>
@@ -100,12 +102,12 @@ 
    <Row>

        <Key

            latin:keySpec="("

            latin:keyStyle="numKeyStyle"

            latin:keyStyle="numSymbolKeyStyle"

            latin:keyWidth="10%p"

            latin:backgroundType="functional" />

        <Key

            latin:keySpec=")"

            latin:keyStyle="numKeyStyle"

            latin:keyStyle="numSymbolKeyStyle"

            latin:keyWidth="10%p"

            latin:backgroundType="functional" />

        <switch>
@@ -114,14 +116,14 @@ 
            >

                <Key

                    latin:keySpec=":"

                    latin:keyStyle="numKeyStyle"

                    latin:keyStyle="numSymbolKeyStyle"

                    latin:keyWidth="10%p"

                    latin:backgroundType="functional" />

            </case>

            <default>

                <Key

                    latin:keySpec="="

                    latin:keyStyle="numKeyStyle"

                    latin:keyStyle="numSymbolKeyStyle"

                    latin:keyWidth="10%p"

                    latin:backgroundType="functional" />

            </default>
@@ -143,8 +145,10 @@ 
        <Key

            latin:keyStyle="tabletNumSpaceKeyStyle"

            latin:keyWidth="30%p" />

        <!-- U+FF0A: "＊" FULLWIDTH ASTERISK -->

        <Key

            latin:keyStyle="numStarKeyStyle"

            latin:keySpec="&#xFF0A;|*"

            latin:keyStyle="numSymbolKeyStyle"

            latin:keyXPos="31%p" />

        <Key

            latin:keySpec="0"

java/res/xml-sw600dp/rows_phone.xml

+17 −11
Original line number Diff line number Diff line
@@ -28,16 +28,18 @@ 
    <Row>

        <Key

            latin:keySpec="-"

            latin:keyStyle="numKeyStyle"

            latin:keyStyle="numSymbolKeyStyle"

            latin:keyWidth="10%p"

            latin:backgroundType="functional" />

        <Key

            latin:keySpec="+"

            latin:keyStyle="numKeyStyle"

            latin:keyStyle="numSymbolKeyStyle"

            latin:keyWidth="10%p"

            latin:backgroundType="functional" />

        <Key

            latin:keyStyle="numPauseKeyStyle"

            latin:keySpec="!string/label_pause_key|,"

            latin:keyLabelFlags="followKeyLabelRatio|autoXScale"

            latin:keyStyle="numSymbolKeyStyle"

            latin:keyWidth="10%p"

            latin:backgroundType="functional" />

        <Key
@@ -55,16 +57,18 @@ 
    <Row>

        <Key

            latin:keySpec=","

            latin:keyStyle="numKeyStyle"

            latin:keyStyle="numSymbolKeyStyle"

            latin:keyWidth="10%p"

            latin:backgroundType="functional" />

        <Key

            latin:keySpec="."

            latin:keyStyle="numKeyStyle"

            latin:keyStyle="numSymbolKeyStyle"

            latin:keyWidth="10%p"

            latin:backgroundType="functional" />

        <Key

            latin:keyStyle="numWaitKeyStyle"

            latin:keySpec="!string/label_wait_key|;"

            latin:keyLabelFlags="followKeyLabelRatio|autoXScale"

            latin:keyStyle="numSymbolKeyStyle"

            latin:keyWidth="10%p"

            latin:backgroundType="functional" />

        <Key
@@ -82,17 +86,17 @@ 
    <Row>

        <Key

            latin:keySpec="("

            latin:keyStyle="numKeyStyle"

            latin:keyStyle="numSymbolKeyStyle"

            latin:keyWidth="10%p"

            latin:backgroundType="functional" />

        <Key

            latin:keySpec=")"

            latin:keyStyle="numKeyStyle"

            latin:keyStyle="numSymbolKeyStyle"

            latin:keyWidth="10%p"

            latin:backgroundType="functional" />

        <Key

            latin:keySpec="N"

            latin:keyStyle="numKeyStyle"

            latin:keyStyle="numSymbolKeyStyle"

            latin:keyWidth="10%p"

            latin:backgroundType="functional" />

        <Key
@@ -109,14 +113,16 @@ 
        <Key

            latin:keyStyle="tabletNumSpaceKeyStyle"

            latin:keyWidth="30%p" />

        <!-- U+FF0A: "＊" FULLWIDTH ASTERISK -->

        <Key

            latin:keyStyle="numStarKeyStyle"

            latin:keySpec="&#xFF0A;|*"

            latin:keyStyle="numSymbolKeyStyle"

            latin:keyXPos="31%p" />

        <Key

            latin:keyStyle="num0KeyStyle"

            latin:keyHintLabel="+" />

        <Key

            latin:keySpec="\#"

            latin:keyStyle="numKeyStyle" />

            latin:keyStyle="numSymbolKeyStyle" />

    </Row>

</merge>

java/res/xml/key_styles_number.xml

+1 −18
Original line number Diff line number Diff line
@@ -33,9 +33,7 @@ 
        latin:keyLabelFlags="fontNormal|followKeyLetterRatio|followFunctionalTextColor"

        latin:parentStyle="numKeyBaseStyle" />

    <key-style

        latin:styleName="numFunctionalKeyStyle"

        latin:keyLabelFlags="followKeyLargeLetterRatio"

        latin:backgroundType="functional"

        latin:styleName="numSymbolKeyStyle"

        latin:parentStyle="numKeyBaseStyle" />

    <key-style

        latin:styleName="numberKeyStyle"
@@ -89,11 +87,6 @@ 
        latin:keySpec="9"

        latin:keyHintLabel="WXYZ"

        latin:parentStyle="numberKeyStyle" />

    <!-- U+FF0A: "＊" FULLWIDTH ASTERISK -->

    <key-style

        latin:styleName="numStarKeyStyle"

        latin:keySpec="&#xFF0A;|*"

        latin:parentStyle="numKeyStyle" />

    <!-- Only for non-tablet device -->

    <key-style

        latin:styleName="numPhoneToSymbolKeyStyle"
@@ -103,16 +96,6 @@ 
        latin:styleName="numPhoneToNumericKeyStyle"

        latin:keySpec="!text/keylabel_to_phone_numeric|!code/key_switch_alpha_symbol"

        latin:parentStyle="numModeKeyStyle" />

    <key-style

        latin:styleName="numPauseKeyStyle"

        latin:keySpec="!text/label_pause_key|,"

        latin:keyLabelFlags="followKeyLabelRatio|autoXScale"

        latin:parentStyle="numKeyBaseStyle" />

    <key-style

        latin:styleName="numWaitKeyStyle"

        latin:keySpec="!text/label_wait_key|;"

        latin:keyLabelFlags="followKeyLabelRatio|autoXScale"

        latin:parentStyle="numKeyBaseStyle" />

    <key-style

        latin:styleName="numTabKeyStyle"

        latin:keyActionFlags="noKeyPreview"

java/res/xml/rows_number_normal.xml

+9 −5
Original line number Diff line number Diff line
@@ -35,7 +35,8 @@ 
            latin:keySpec="-"

            latin:moreKeys="+"

            latin:keyLabelFlags="hasPopupHint"

            latin:keyStyle="numFunctionalKeyStyle"

            latin:keyStyle="numKeyStyle"

            latin:backgroundType="functional"

            latin:keyWidth="fillRight" />

    </Row>

    <Row>
@@ -54,7 +55,8 @@ 
            >

                <Key

                    latin:keySpec="."

                    latin:keyStyle="numFunctionalKeyStyle"

                    latin:keyStyle="numKeyStyle"

                    latin:backgroundType="functional"

                    latin:keyWidth="fillRight" />

            </case>

            <case
@@ -62,15 +64,17 @@ 
            >

                <Key

                    latin:keySpec="."

                    latin:keyLabelFlags="hasPopupHint"

                    latin:moreKeys="!text/morekeys_am_pm"

                    latin:keyStyle="numFunctionalKeyStyle"

                    latin:keyLabelFlags="hasPopupHint"

                    latin:keyStyle="numKeyStyle"

                    latin:backgroundType="functional"

                    latin:keyWidth="fillRight" />

            </case>

            <default>

                <Key

                    latin:keySpec=","

                    latin:keyStyle="numFunctionalKeyStyle"

                    latin:keyStyle="numKeyStyle"

                    latin:backgroundType="functional"

                    latin:keyWidth="fillRight" />

            </default>

        </switch>

java/res/xml/rows_phone.xml

+4 −2
Original line number Diff line number Diff line
@@ -36,7 +36,8 @@ 
            latin:keySpec="-"

            latin:moreKeys="+"

            latin:keyLabelFlags="hasPopupHint"

            latin:keyStyle="numFunctionalKeyStyle"

            latin:keyStyle="numKeyStyle"

            latin:backgroundType="functional"

            latin:keyWidth="fillRight" />

    </Row>

    <Row>
@@ -48,7 +49,8 @@ 
            latin:keyStyle="num6KeyStyle" />

        <Key

            latin:keySpec="."

            latin:keyStyle="numFunctionalKeyStyle"

            latin:keyStyle="numKeyStyle"

            latin:backgroundType="functional"

            latin:keyWidth="fillRight" />

    </Row>

    <Row>