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

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

Merge "Rename and reorganize key code"

parents 1b9eecb5 d2c5fdda

java/res/values/keycodes.xml

+3 −3
Original line number Diff line number Diff line
@@ -26,8 +26,8 @@ 
    <integer name="key_shift">-1</integer>

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

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

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

    <integer name="key_voice">-102</integer>

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

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



    <!-- Array used for mapping key codes to description strings. -->

    <array name="key_descriptions">
@@ -45,7 +45,7 @@ 
        <item>@string/description_delete_key</item>

        <item>@integer/key_settings</item>

        <item>@string/description_settings_key</item>

        <item>@integer/key_voice</item>

        <item>@integer/key_shortcut</item>

        <item>@string/description_voice_key</item>

    </array>

</resources>

java/res/xml-xlarge/kbd_key_styles.xml

+2 −2
Original line number Diff line number Diff line
@@ -73,7 +73,7 @@ 
                latin:parentStyle="functionalKeyStyle" />

            <key-style

                latin:styleName="micKeyStyle"

                latin:code="@integer/key_voice"

                latin:code="@integer/key_shortcut"

                latin:keyIcon="@drawable/sym_keyboard_voice_holo"

                latin:iconPreview="@drawable/sym_keyboard_feedback_mic"

                latin:parentStyle="functionalKeyStyle" />
@@ -127,7 +127,7 @@ 
                latin:parentStyle="functionalKeyStyle" />

            <key-style

                latin:styleName="micKeyStyle"

                latin:code="@integer/key_voice"

                latin:code="@integer/key_shortcut"

                latin:keyIcon="@drawable/sym_bkeyboard_mic"

                latin:iconPreview="@drawable/sym_keyboard_feedback_mic"

                latin:parentStyle="functionalKeyStyle" />

java/res/xml/kbd_key_styles.xml

+2 −2
Original line number Diff line number Diff line
@@ -118,7 +118,7 @@ 
                latin:parentStyle="functionalKeyStyle" />

            <key-style

                latin:styleName="micKeyStyle"

                latin:code="@integer/key_voice"

                latin:code="@integer/key_shortcut"

                latin:keyIcon="@drawable/sym_keyboard_mic"

                latin:iconPreview="@drawable/sym_keyboard_feedback_mic"

                latin:parentStyle="settingsPopupStyle" />
@@ -191,7 +191,7 @@ 
                latin:parentStyle="functionalKeyStyle" />

            <key-style

                latin:styleName="micKeyStyle"

                latin:code="@integer/key_voice"

                latin:code="@integer/key_shortcut"

                latin:keyIcon="@drawable/sym_bkeyboard_mic"

                latin:iconPreview="@drawable/sym_keyboard_feedback_mic"

                latin:parentStyle="settingsPopupStyle" />

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

+5 −10
Original line number Diff line number Diff line
@@ -68,19 +68,14 @@ public class Keyboard { 
    public static final int CODE_DUMMY = 0;

    public static final int CODE_SHIFT = -1;

    public static final int CODE_SWITCH_ALPHA_SYMBOL = -2;

    public static final int CODE_CANCEL = -3;

    public static final int CODE_DONE = -4;

    public static final int CODE_CAPSLOCK = -3;

    public static final int CODE_CANCEL = -4;

    public static final int CODE_DELETE = -5;

    public static final int CODE_ALT = -6;

    public static final int CODE_SETTINGS = -6;

    public static final int CODE_SETTINGS_LONGPRESS = -7;

    public static final int CODE_SHORTCUT = -8;

    // Code value representing the code is not specified.

    public static final int CODE_UNSPECIFIED = -99;

    public static final int CODE_SETTINGS = -100;

    public static final int CODE_SETTINGS_LONGPRESS = -101;

    // TODO: remove this once LatinIME stops referring to this.

    public static final int CODE_VOICE = -102;

    public static final int CODE_CAPSLOCK = -103;

    public static final int CODE_NEXT_LANGUAGE = -104;

    public static final int CODE_PREV_LANGUAGE = -105;



    /** Horizontal gap default for all rows */

    private int mDefaultHorizontalGap;

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

+4 −1
Original line number Diff line number Diff line
@@ -46,6 +46,9 @@ import java.util.Locale; 
public class LatinKeyboard extends Keyboard {

    private static final int SPACE_LED_LENGTH_PERCENT = 80;



    public static final int CODE_NEXT_LANGUAGE = -100;

    public static final int CODE_PREV_LANGUAGE = -101;



    private final Context mContext;

    private final SubtypeSwitcher mSubtypeSwitcher = SubtypeSwitcher.getInstance();
@@ -102,7 +105,7 @@ public class LatinKeyboard extends Keyboard { 
            case CODE_SPACE:

                spaceKeyIndex = index;

                break;

            case CODE_VOICE:

            case CODE_SHORTCUT:

                shortcutKeyIndex = index;

                break;

            }