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

Commit 5f57fe4a authored by Ken Wakasa's avatar Ken Wakasa Committed by Android (Google) Code Review
Browse files

Merge "Revert "Remove unused Key and Keyboard attributes"" into lmp-dev

parents 52183821 44e20f4f

java/res/values-sw600dp/config.xml

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

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

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

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

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

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

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

java/res/values-sw768dp/config.xml

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

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

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

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

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

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

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

java/res/values/attrs.xml

+3 −0
Original line number Diff line number Diff line
@@ -300,6 +300,7 @@ 
            <flag name="followKeyLargeLetterRatio" value="0x40" />

            <flag name="followKeyLetterRatio" value="0x80" />

            <flag name="followKeyLabelRatio" value="0xC0" />

            <flag name="followKeyLargeLabelRatio" value="0x100" />

            <flag name="followKeyHintLabelRatio" value="0x140" />

            <flag name="hasPopupHint" value="0x200" />

            <flag name="hasShiftedLetterHint" value="0x400" />
@@ -358,6 +359,8 @@ 
        <attr name="keyLabelSize" format="dimension|fraction" />

        <!-- Large size of the text for one letter keys, in the proportion of key height. -->

        <attr name="keyLargeLetterRatio" format="fraction" />

        <!-- Large size of the text for keys with multiple letters, in the proportion of key height. -->

        <attr name="keyLargeLabelRatio" format="fraction" />

        <!-- Size of the text for hint letter (= one character hint label), in the proportion of

             key height. -->

        <attr name="keyHintLetterRatio" format="fraction" />

java/res/values/config.xml

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

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

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

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

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

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

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

java/res/values/themes-common.xml

+1 −0
Original line number Diff line number Diff line
@@ -37,6 +37,7 @@ 
        <item name="keyLetterSize">@fraction/config_key_letter_ratio</item>

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

        <item name="keyLabelSize">@fraction/config_key_label_ratio</item>

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

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

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

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