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

Commit 7f0c503a authored by Tadashi G. Takaoka's avatar Tadashi G. Takaoka
Browse files

Use !icon/<icon_name> notation for more keys spec 

Change-Id: I616e6c1ac603d2eb7a5c99ec70d5411371d15f3e
parent ed3bac91

java/res/values/attrs.xml

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

        </attr>

        <!-- The icon to display on the key instead of the label. -->

        <!-- TODO: Use string format !icon/name. -->

        <attr name="keyIcon" format="enum">

            <!-- This should be aligned with the KeyboardIconsSet.ICON_* -->

            <enum name="iconUndefined" value="0" />
@@ -319,11 +320,13 @@ 
            <enum name="iconZwjKey" value="16" />

        </attr>

        <!-- The icon for disabled key -->

        <!-- TODO: Use string format !icon/name. -->

        <attr name="keyIconDisabled" format="enum">

            <!-- This should be aligned with the KeyboardIconsSet.ICON_* -->

            <enum name="iconDisabledShortcutKey" value="12" />

        </attr>

        <!-- The icon to show in the popup preview. -->

        <!-- TODO: Use string format !icon/name. -->

        <attr name="keyIconPreview" format="enum">

            <!-- This should be aligned with the KeyboardIconsSet.ICON_* -->

            <enum name="iconPreviewTabKey" value="13" />

java/res/values/donottranslate-more-keys.xml

+1 −1
Original line number Diff line number Diff line
@@ -120,7 +120,7 @@ 
         U+2205: "∅" EMPTY SET -->

    <string name="more_keys_for_symbols_0">&#x207F;,&#x2205;</string>

    <string name="more_keys_for_am_pm">!fixedColumnOrder!2,!hasLabels!,\@string/label_time_am,\@string/label_time_pm</string>

    <string name="settings_as_more_key">\@icon/settingsKey|!code/key_settings</string>

    <string name="settings_as_more_key">!icon/settingsKey|!code/key_settings</string>

    <string name="keylabel_for_comma">,</string>

    <string name="more_keys_for_comma"></string>

    <string name="action_next_as_more_key">!hasLabels!,\@string/label_next_key|!code/key_action_next</string>

java/res/xml-sw600dp/key_styles_common.xml

+1 −1
Original line number Diff line number Diff line
@@ -84,7 +84,7 @@ 
        latin:styleName="zwnjKeyStyle"

        latin:code="0x200C"

        latin:keyIcon="iconZwnjKey"

        latin:moreKeys="\@icon/zwjKey|&#x200D;"

        latin:moreKeys="!icon/zwjKey|&#x200D;"

        latin:keyLabelFlags="hasPopupHint"

        latin:keyActionFlags="noKeyPreview" />

    <key-style

java/res/xml-sw768dp/key_styles_common.xml

+1 −1
Original line number Diff line number Diff line
@@ -83,7 +83,7 @@ 
        latin:styleName="zwnjKeyStyle"

        latin:code="0x200C"

        latin:keyIcon="iconZwnjKey"

        latin:moreKeys="\@icon/zwjKey|&#x200D;"

        latin:moreKeys="!icon/zwjKey|&#x200D;"

        latin:keyLabelFlags="hasPopupHint"

        latin:keyActionFlags="noKeyPreview" />

    <key-style

java/res/xml/key_styles_common.xml

+1 −1
Original line number Diff line number Diff line
@@ -113,7 +113,7 @@ 
        latin:styleName="zwnjKeyStyle"

        latin:code="0x200C"

        latin:keyIcon="iconZwnjKey"

        latin:moreKeys="\@icon/zwjKey|&#x200D;"

        latin:moreKeys="!icon/zwjKey|&#x200D;"

        latin:keyLabelFlags="hasPopupHint"

        latin:keyActionFlags="noKeyPreview"

        latin:backgroundType="functional" />