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

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

Merge "Use large label text size for action label" into jb-dev

parents 91492993 88d378bc

java/res/values-sw600dp/dimens.xml

+1 −0
Original line number Diff line number Diff line
@@ -57,6 +57,7 @@ 
    <fraction name="key_letter_ratio">42%</fraction>

    <fraction name="key_large_letter_ratio">45%</fraction>

    <fraction name="key_label_ratio">25%</fraction>

    <fraction name="key_large_label_ratio">32%</fraction>

    <fraction name="key_hint_letter_ratio">23%</fraction>

    <fraction name="key_hint_label_ratio">28%</fraction>

    <fraction name="key_uppercase_letter_ratio">22%</fraction>

java/res/values-sw768dp/dimens.xml

+1 −0
Original line number Diff line number Diff line
@@ -58,6 +58,7 @@ 
    <fraction name="key_letter_ratio">40%</fraction>

    <fraction name="key_large_letter_ratio">42%</fraction>

    <fraction name="key_label_ratio">28%</fraction>

    <fraction name="key_large_label_ratio">28%</fraction>

    <fraction name="key_hint_letter_ratio">23%</fraction>

    <fraction name="key_hint_label_ratio">28%</fraction>

    <fraction name="key_uppercase_letter_ratio">26%</fraction>

java/res/values/dimens.xml

+1 −0
Original line number Diff line number Diff line
@@ -59,6 +59,7 @@ 
    <fraction name="key_letter_ratio">55%</fraction>

    <fraction name="key_large_letter_ratio">65%</fraction>

    <fraction name="key_label_ratio">34%</fraction>

    <fraction name="key_large_label_ratio">40%</fraction>

    <fraction name="key_hint_letter_ratio">25%</fraction>

    <fraction name="key_hint_label_ratio">44%</fraction>

    <fraction name="key_uppercase_letter_ratio">35%</fraction>

java/res/values/styles.xml

+1 −0
Original line number Diff line number Diff line
@@ -38,6 +38,7 @@ 
        <item name="keyLetterRatio">@fraction/key_letter_ratio</item>

        <item name="keyLargeLetterRatio">@fraction/key_large_letter_ratio</item>

        <item name="keyLabelRatio">@fraction/key_label_ratio</item>

        <item name="keyLargeLabelRatio">@fraction/key_large_label_ratio</item>

        <item name="keyHintLetterRatio">@fraction/key_hint_letter_ratio</item>

        <item name="keyHintLabelRatio">@fraction/key_hint_label_ratio</item>

        <item name="keyShiftedLetterHintRatio">@fraction/key_uppercase_letter_ratio</item>

java/res/xml-sw600dp/key_styles_common.xml

+9 −0
Original line number Diff line number Diff line
@@ -74,6 +74,15 @@ 
        latin:backgroundType="functional" />

    <include

        latin:keyboardLayout="@xml/key_styles_enter" />

    <!-- Override defaultEnterKeyStyle in key_styles_enter.xml -->

    <key-style

        latin:styleName="defaultEnterKeyStyle"

        latin:code="!code/key_enter"

        latin:keyIcon="!icon/enter_key"

        latin:keyLabelFlags="preserveCase|autoXScale|followKeyLargeLabelRatio"

        latin:keyActionFlags="noKeyPreview"

        latin:backgroundType="functional"

        latin:parentStyle="navigateMoreKeysStyle" />

    <key-style

        latin:styleName="spaceKeyStyle"

        latin:code="!code/key_space"