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

Commit c29276b7 authored by Tadashi G. Takaoka's avatar Tadashi G. Takaoka Committed by Android Git Automerger
Browse files

am 12814352: am 486c4894: Keep aspect ratio of Material action key background 

* commit '12814352':
  Keep aspect ratio of Material action key background
parents beb74610 12814352

java/res/values/attrs.xml

+2 −0
Original line number Diff line number Diff line
@@ -338,6 +338,8 @@ 
            <!-- If true, use functionalTextColor instead of ketTextColor to drawing the label on

                 the key -->

            <flag name="followFunctionalTextColor" value="0x80000" />

            <!-- Keep aspect ratio of key background. -->

            <flag name="keepBackgroundAspectRatio" value="0x100000" />

            <!-- If true, disable keyHintLabel. -->

            <flag name="disableKeyHintLabel" value="0x40000000" />

            <!-- If true, disable additionalMoreKeys. -->

java/res/values/themes-lxx-dark.xml

+1 −0
Original line number Diff line number Diff line
@@ -114,6 +114,7 @@ 
        <item name="android:background">@android:color/transparent</item>

        <item name="keyBackground">@drawable/btn_keyboard_key_popup_action_lxx_dark</item>

        <item name="divider">@null</item>

        <item name="keyLabelFlags">keepBackgroundAspectRatio</item>

    </style>

    <style

        name="SuggestionStripView.LXX_Dark"

java/res/values/themes-lxx-light.xml

+1 −0
Original line number Diff line number Diff line
@@ -114,6 +114,7 @@ 
        <item name="android:background">@android:color/transparent</item>

        <item name="keyBackground">@drawable/btn_keyboard_key_popup_action_lxx_light</item>

        <item name="divider">@null</item>

        <item name="keyLabelFlags">keepBackgroundAspectRatio</item>

    </style>

    <style

        name="SuggestionStripView.LXX_Light"

java/res/xml-sw600dp/key_styles_enter.xml

+21 −7
Original line number Diff line number Diff line
@@ -80,6 +80,8 @@ 
        </default>

    </switch>

    <!-- Enter key style -->

    <switch>

        <case latin:keyboardTheme="ICS|KLP">

            <key-style

                latin:styleName="defaultEnterKeyStyle"

                latin:keySpec="!icon/enter_key|!code/key_enter"
@@ -87,6 +89,18 @@ 
                latin:keyActionFlags="noKeyPreview"

                latin:backgroundType="action"

                latin:parentStyle="navigateMoreKeysStyle" />

        </case>

        <!-- keyboardTheme="LXXLight|LXXDark" -->

        <default>

            <key-style

                latin:styleName="defaultEnterKeyStyle"

                latin:keySpec="!icon/enter_key|!code/key_enter"

                latin:keyLabelFlags="preserveCase|autoXScale|followKeyLabelRatio|followFunctionalTextColor|keepBackgroundAspectRatio"

                latin:keyActionFlags="noKeyPreview"

                latin:backgroundType="action"

                latin:parentStyle="navigateMoreKeysStyle" />

        </default>

    </switch>

    <include latin:keyboardLayout="@xml/key_styles_actions" />

    <switch>

        <!-- Shift + Enter in textMultiLine field. -->

java/res/xml/key_styles_common.xml

+18 −5
Original line number Diff line number Diff line
@@ -80,11 +80,24 @@ 
        latin:keyActionFlags="isRepeatable|noKeyPreview"

        latin:backgroundType="functional" />

    <!-- emojiKeyStyle must be defined before including @xml/key_syles_enter. -->

    <switch>

        <case latin:keyboardTheme="ICS|KLP">

            <key-style

                latin:styleName="emojiKeyStyle"

                latin:keySpec="!icon/emoji_action_key|!code/key_emoji"

                latin:keyActionFlags="noKeyPreview"

                latin:backgroundType="action" />

        </case>

        <!-- keyboardTheme="LXXLight|LXXDark" -->

        <default>

            <key-style

                latin:styleName="emojiKeyStyle"

                latin:keySpec="!icon/emoji_action_key|!code/key_emoji"

                latin:keyLabelFlags="keepBackgroundAspectRatio"

                latin:keyActionFlags="noKeyPreview"

                latin:backgroundType="action" />

        </default>

    </switch>

    <include

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

    <!-- TODO: Currently there is no way to specify icon alignment per theme. -->