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

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

Show icon on action key when it is defined in keyboard theme 

This CL also adds the following icons name for an action key.
- Go
- Send
- Next
- Done
- Previous

Bug: 14259323
Change-Id: I48bba708d1f78349270d2ca01aebd8f111685723
parent 1c8e069d

java/res/values/attrs.xml

+5 −0
Original line number Diff line number Diff line
@@ -217,7 +217,12 @@ 
        <attr name="iconSettingsKey" format="reference" />

        <attr name="iconSpaceKey" format="reference" />

        <attr name="iconEnterKey" format="reference" />

        <attr name="iconGoKey" format="reference" />

        <attr name="iconSearchKey" format="reference" />

        <attr name="iconSendKey" format="reference" />

        <attr name="iconNextKey" format="reference" />

        <attr name="iconDoneKey" format="reference" />

        <attr name="iconPreviousKey" format="reference" />

        <attr name="iconTabKey" format="reference" />

        <attr name="iconShortcutKey" format="reference" />

        <attr name="iconSpaceKeyForNumberLayout" format="reference" />

java/res/values/keyboard-icons-lmp.xml

+6 −0
Original line number Diff line number Diff line
@@ -26,7 +26,13 @@ 
        <item name="iconSettingsKey">@drawable/sym_keyboard_settings_holo_dark</item>

        <item name="iconSpaceKey">@drawable/sym_keyboard_space_holo_dark</item>

        <item name="iconEnterKey">@drawable/sym_keyboard_return_holo_dark</item>

        <!-- TODO: Uncomment those icon definitions once we have those icon assets. -->

        <!-- <item name="iconGoKey">@drawable/sym_keyboard_go_holo_dark</item> -->

        <item name="iconSearchKey">@drawable/sym_keyboard_search_holo_dark</item>

        <!-- <item name="iconSendKey">@drawable/sym_keyboard_send_holo_dark</item> -->

        <!-- <item name="iconNextKey">@drawable/sym_keyboard_next_holo_dark</item> -->

        <!-- <item name="iconDoneKey">@drawable/sym_keyboard_done_holo_dark</item> -->

        <!-- <item name="iconPreviousKey">@drawable/sym_keyboard_previous_holo_dark</item> -->

        <item name="iconTabKey">@drawable/sym_keyboard_tab_holo_dark</item>

        <item name="iconShortcutKey">@drawable/sym_keyboard_voice_holo_dark</item>

        <item name="iconSpaceKeyForNumberLayout">@drawable/sym_keyboard_space_holo_dark</item>

java/res/xml-sw600dp/key_styles_enter.xml

+50 −0
Original line number Diff line number Diff line
@@ -115,6 +115,16 @@ 
                latin:keySpec="!icon/enter_key|!code/key_shift_enter"

                latin:parentStyle="defaultEnterKeyStyle" />

        </case>

        <case

            latin:imeAction="actionGo"

            latin:isIconDefined="go_key"

        >

            <key-style

                latin:styleName="enterKeyStyle"

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

                latin:backgroundType="action"

                latin:parentStyle="defaultEnterKeyStyle" />

        </case>

        <case

            latin:imeAction="actionGo"

        >
@@ -124,6 +134,16 @@ 
                latin:backgroundType="action"

                latin:parentStyle="defaultEnterKeyStyle" />

        </case>

        <case

            latin:imeAction="actionNext"

            latin:isIconDefined="next_key"

        >

            <key-style

                latin:styleName="enterKeyStyle"

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

                latin:backgroundType="action"

                latin:parentStyle="defaultEnterKeyStyle" />

        </case>

        <case

            latin:imeAction="actionNext"

        >
@@ -133,6 +153,16 @@ 
                latin:backgroundType="action"

                latin:parentStyle="defaultEnterKeyStyle" />

        </case>

        <case

            latin:imeAction="actionPrevious"

            latin:isIconDefined="previous_key"

        >

            <key-style

                latin:styleName="enterKeyStyle"

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

                latin:backgroundType="action"

                latin:parentStyle="defaultEnterKeyStyle" />

        </case>

        <case

            latin:imeAction="actionPrevious"

        >
@@ -142,6 +172,16 @@ 
                latin:backgroundType="action"

                latin:parentStyle="defaultEnterKeyStyle" />

        </case>

        <case

            latin:imeAction="actionDone"

            latin:isIconDefined="done_key"

        >

            <key-style

                latin:styleName="enterKeyStyle"

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

                latin:backgroundType="action"

                latin:parentStyle="defaultEnterKeyStyle" />

        </case>

        <case

            latin:imeAction="actionDone"

        >
@@ -151,6 +191,16 @@ 
                latin:backgroundType="action"

                latin:parentStyle="defaultEnterKeyStyle" />

        </case>

        <case

            latin:imeAction="actionSend"

            latin:isIconDefined="send_key"

        >

            <key-style

                latin:styleName="enterKeyStyle"

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

                latin:backgroundType="action"

                latin:parentStyle="defaultEnterKeyStyle" />

        </case>

        <case

            latin:imeAction="actionSend"

        >

java/res/xml/key_styles_enter.xml

+50 −0
Original line number Diff line number Diff line
@@ -282,6 +282,16 @@ 
                latin:styleName="enterKeyStyle"

                latin:parentStyle="emojiKeyStyle" />

        </case>

        <case

            latin:imeAction="actionGo"

            latin:isIconDefined="go_key"

        >

            <key-style

                latin:styleName="enterKeyStyle"

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

                latin:backgroundType="action"

                latin:parentStyle="defaultEnterKeyStyle" />

        </case>

        <case

            latin:imeAction="actionGo"

        >
@@ -291,6 +301,16 @@ 
                latin:backgroundType="action"

                latin:parentStyle="defaultEnterKeyStyle" />

        </case>

        <case

            latin:imeAction="actionNext"

            latin:isIconDefined="next_key"

        >

            <key-style

                latin:styleName="enterKeyStyle"

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

                latin:backgroundType="action"

                latin:parentStyle="defaultEnterKeyStyle" />

        </case>

        <case

            latin:imeAction="actionNext"

        >
@@ -300,6 +320,16 @@ 
                latin:backgroundType="action"

                latin:parentStyle="defaultEnterKeyStyle" />

        </case>

        <case

            latin:imeAction="actionPrevious"

            latin:isIconDefined="previous_key"

        >

            <key-style

                latin:styleName="enterKeyStyle"

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

                latin:backgroundType="action"

                latin:parentStyle="defaultEnterKeyStyle" />

        </case>

        <case

            latin:imeAction="actionPrevious"

        >
@@ -309,6 +339,16 @@ 
                latin:backgroundType="action"

                latin:parentStyle="defaultEnterKeyStyle" />

        </case>

        <case

            latin:imeAction="actionDone"

            latin:isIconDefined="done_key"

        >

            <key-style

                latin:styleName="enterKeyStyle"

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

                latin:backgroundType="action"

                latin:parentStyle="defaultEnterKeyStyle" />

        </case>

        <case

            latin:imeAction="actionDone"

        >
@@ -318,6 +358,16 @@ 
                latin:backgroundType="action"

                latin:parentStyle="defaultEnterKeyStyle" />

        </case>

        <case

            latin:imeAction="actionSend"

            latin:isIconDefined="send_key"

        >

            <key-style

                latin:styleName="enterKeyStyle"

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

                latin:backgroundType="action"

                latin:parentStyle="defaultEnterKeyStyle" />

        </case>

        <case

            latin:imeAction="actionSend"

        >

java/src/com/android/inputmethod/keyboard/internal/KeyboardIconsSet.java

+10 −0
Original line number Diff line number Diff line
@@ -42,7 +42,12 @@ public final class KeyboardIconsSet { 
    public static final String NAME_SPACE_KEY = "space_key";

    public static final String NAME_SPACE_KEY_FOR_NUMBER_LAYOUT = "space_key_for_number_layout";

    public static final String NAME_ENTER_KEY = "enter_key";

    public static final String NAME_GO_KEY = "go_key";

    public static final String NAME_SEARCH_KEY = "search_key";

    public static final String NAME_SEND_KEY = "send_key";

    public static final String NAME_NEXT_KEY = "next_key";

    public static final String NAME_DONE_KEY = "done_key";

    public static final String NAME_PREVIOUS_KEY = "previous_key";

    public static final String NAME_TAB_KEY = "tab_key";

    public static final String NANE_TAB_KEY_PREVIEW = "tab_key_preview";

    public static final String NAME_SHORTCUT_KEY = "shortcut_key";
@@ -64,7 +69,12 @@ public final class KeyboardIconsSet { 
        NAME_SETTINGS_KEY,                R.styleable.Keyboard_iconSettingsKey,

        NAME_SPACE_KEY,                   R.styleable.Keyboard_iconSpaceKey,

        NAME_ENTER_KEY,                   R.styleable.Keyboard_iconEnterKey,

        NAME_GO_KEY,                      R.styleable.Keyboard_iconGoKey,

        NAME_SEARCH_KEY,                  R.styleable.Keyboard_iconSearchKey,

        NAME_SEND_KEY,                    R.styleable.Keyboard_iconSendKey,

        NAME_NEXT_KEY,                    R.styleable.Keyboard_iconNextKey,

        NAME_DONE_KEY,                    R.styleable.Keyboard_iconDoneKey,

        NAME_PREVIOUS_KEY,                R.styleable.Keyboard_iconPreviousKey,

        NAME_TAB_KEY,                     R.styleable.Keyboard_iconTabKey,

        NAME_SHORTCUT_KEY,                R.styleable.Keyboard_iconShortcutKey,

        NAME_SPACE_KEY_FOR_NUMBER_LAYOUT, R.styleable.Keyboard_iconSpaceKeyForNumberLayout,