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

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

am 5962312b: Custom action label should be a part of keyboard identifier 

* commit '5962312b':
  Custom action label should be a part of keyboard identifier
parents cc940055 5962312b

java/res/values/keycodes.xml

+1 −1
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ 
<resources>

    <!-- These code should be aligned with Keyboard.CODE_*. -->

    <integer name="key_tab">9</integer>

    <integer name="key_return">10</integer>

    <integer name="key_enter">10</integer>

    <integer name="key_space">32</integer>

    <integer name="key_shift">-1</integer>

    <integer name="key_switch_alpha_symbol">-2</integer>

java/res/xml-sw600dp/key_styles_common.xml

+1 −0
Original line number Diff line number Diff line
@@ -111,6 +111,7 @@ 
        latin:code="@integer/key_shortcut"

        latin:keyIcon="iconShortcutKey"

        latin:keyIconDisabled="iconDisabledShortcutKey"

        latin:keyLabelFlags="preserveCase"

        latin:keyActionFlags="noKeyPreview|altCodeWhileTyping"

        latin:parentStyle="f2PopupStyle" />

    <key-style

java/res/xml-sw768dp/key_styles_common.xml

+1 −0
Original line number Diff line number Diff line
@@ -93,6 +93,7 @@ 
        latin:code="@integer/key_shortcut"

        latin:keyIcon="iconShortcutKey"

        latin:keyIconDisabled="iconDisabledShortcutKey"

        latin:keyLabelFlags="preserveCase"

        latin:keyActionFlags="noKeyPreview|altCodeWhileTyping"

        latin:backgroundType="functional" />

    <key-style

java/res/xml/key_styles_common.xml

+1 −0
Original line number Diff line number Diff line
@@ -110,6 +110,7 @@ 
        latin:code="@integer/key_shortcut"

        latin:keyIcon="iconShortcutKey"

        latin:keyIconDisabled="iconDisabledShortcutKey"

        latin:keyLabelFlags="preserveCase"

        latin:keyActionFlags="noKeyPreview|altCodeWhileTyping"

        latin:altCode="@integer/key_space"

        latin:parentStyle="f1PopupStyle" />

java/res/xml/key_styles_enter_phone.xml

+1 −1
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ 
    <!-- Enter key style -->

    <key-style

        latin:styleName="defaultEnterKeyStyle"

        latin:code="@integer/key_return"

        latin:code="@integer/key_enter"

        latin:keyIcon="iconReturnKey"

        latin:keyLabelFlags="autoXScale|preserveCase"

        latin:keyActionFlags="noKeyPreview"