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

Commit a042150a authored by Tadashi G. Takaoka's avatar Tadashi G. Takaoka Committed by Android (Google) Code Review
Browse files

Merge "Just ignore settings/shortcut key while typing on tablet"

parents 9750165c 623d0155

java/res/values/keycodes.xml

+1 −0
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ 
    <integer name="key_tab">9</integer>

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

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

    <integer name="key_dummy">0</integer>

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

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

    <integer name="key_delete">-5</integer>

java/res/xml-sw600dp/kbd_key_styles.xml

+2 −2
Original line number Diff line number Diff line
@@ -78,14 +78,14 @@ 
        latin:code="@integer/key_shortcut"

        latin:keyIcon="iconShortcutKey"

        latin:keyActionFlags="noKeyPreview|altCodeWhileTyping"

        latin:altCode="@integer/key_space"

        latin:altCode="@integer/key_dummy"

        latin:parentStyle="f2PopupStyle" />

    <key-style

        latin:styleName="settingsKeyStyle"

        latin:code="@integer/key_settings"

        latin:keyIcon="iconSettingsKey"

        latin:keyActionFlags="noKeyPreview|altCodeWhileTyping"

        latin:altCode="@integer/key_space"

        latin:altCode="@integer/key_dummy"

        latin:backgroundType="functional" />

    <key-style

        latin:styleName="tabKeyStyle"

java/res/xml-sw768dp/kbd_key_styles.xml

+2 −2
Original line number Diff line number Diff line
@@ -60,14 +60,14 @@ 
        latin:code="@integer/key_shortcut"

        latin:keyIcon="iconShortcutKey"

        latin:keyActionFlags="noKeyPreview|altCodeWhileTyping"

        latin:altCode="@integer/key_space"

        latin:altCode="@integer/key_dummy"

        latin:backgroundType="functional" />

    <key-style

        latin:styleName="settingsKeyStyle"

        latin:code="@integer/key_settings"

        latin:keyIcon="iconSettingsKey"

        latin:keyActionFlags="noKeyPreview|altCodeWhileTyping"

        latin:altCode="@integer/key_space"

        latin:altCode="@integer/key_dummy"

        latin:backgroundType="functional" />

    <key-style

        latin:styleName="tabKeyStyle"

java/src/com/android/inputmethod/keyboard/Keyboard.java

+3 −0
Original line number Diff line number Diff line
@@ -151,6 +151,9 @@ public class Keyboard { 
    }



    public Key getKey(int code) {

        if (code == CODE_DUMMY) {

            return null;

        }

        final Integer keyCode = code;

        if (mKeyCache.containsKey(keyCode)) {

            return mKeyCache.get(keyCode);