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

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

Merge "Get rid of Keyboard.CODE_DUMMY"

parents 82b3727c 8cab0b56

java/res/values/keycodes.xml

+3 −1
Original line number Diff line number Diff line
@@ -23,10 +23,12 @@ 
    <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_capslock">-3</integer>

    <integer name="key_output_text">-4</integer>

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

    <integer name="key_settings">-6</integer>

    <integer name="key_shortcut">-7</integer>

    <integer name="key_unspecified">-9</integer>

</resources>

java/res/xml-sw600dp/kbd_key_styles.xml

+0 −2
Original line number Diff line number Diff line
@@ -78,14 +78,12 @@ 
        latin:keyIcon="iconShortcutKey"

        latin:keyIconDisabled="iconDisabledShortcutKey"

        latin:keyActionFlags="noKeyPreview|altCodeWhileTyping"

        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_dummy"

        latin:backgroundType="functional" />

    <key-style

        latin:styleName="tabKeyStyle"

java/res/xml-sw768dp/kbd_key_styles.xml

+0 −2
Original line number Diff line number Diff line
@@ -60,14 +60,12 @@ 
        latin:keyIcon="iconShortcutKey"

        latin:keyIconDisabled="iconDisabledShortcutKey"

        latin:keyActionFlags="noKeyPreview|altCodeWhileTyping"

        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_dummy"

        latin:backgroundType="functional" />

    <key-style

        latin:styleName="tabKeyStyle"

java/res/xml/kbd_settings_or_tab.xml

+2 −2
Original line number Diff line number Diff line
@@ -26,10 +26,10 @@ 
            latin:hasSettingsKey="true"

        >

            <!-- Because this settings key is not adjacent to the space key, this key should be

                 just ignored while typing (altCode=CODE_DUMMY). -->

                 just ignored while typing (altCode=CODE_UNSPECIFIED). -->

            <Key

                latin:keyStyle="settingsKeyStyle"

                latin:altCode="@integer/key_dummy"

                latin:altCode="@integer/key_unspecified"

                latin:keyWidth="9.2%p" />

        </case>

        <!-- hasSettingsKey="false" -->

java/src/com/android/inputmethod/accessibility/KeyCodeDescriptionMapper.java

+1 −1
Original line number Diff line number Diff line
@@ -142,7 +142,7 @@ public class KeyCodeDescriptionMapper { 
        }



        // Just attempt to speak the description.

        if (key.mCode != Keyboard.CODE_DUMMY) {

        if (key.mCode != Keyboard.CODE_UNSPECIFIED) {

            return getDescriptionForKeyCode(context, keyboard, key, shouldObscure);

        }