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

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

Merge "Tab key preforms next action when EditorInfo.IME_ACTION_NEXT is specified" into jb-dev

parents 47021b7a 0b831ba2

java/src/com/android/inputmethod/latin/InputAttributes.java

+3 −0
Original line number Diff line number Diff line
@@ -29,6 +29,7 @@ public class InputAttributes { 
    final public boolean mInputTypeNoAutoCorrect;

    final public boolean mIsSettingsSuggestionStripOn;

    final public boolean mApplicationSpecifiedCompletionOn;

    final public int mEditorAction;



    public InputAttributes(final EditorInfo editorInfo, final boolean isFullscreenMode) {

        final int inputType = null != editorInfo ? editorInfo.inputType : 0;
@@ -91,6 +92,8 @@ public class InputAttributes { 


            mApplicationSpecifiedCompletionOn = flagAutoComplete && isFullscreenMode;

        }

        mEditorAction = (editorInfo == null) ? EditorInfo.IME_ACTION_UNSPECIFIED

                : editorInfo.imeOptions & EditorInfo.IME_MASK_ACTION;

    }



    @SuppressWarnings("unused")

java/src/com/android/inputmethod/latin/LatinIME.java

+5 −0
Original line number Diff line number Diff line
@@ -1257,6 +1257,11 @@ public class LatinIME extends InputMethodService implements KeyboardActionListen 
            handleLanguageSwitchKey();

            break;

        default:

            if (primaryCode == Keyboard.CODE_TAB

                    && mInputAttributes.mEditorAction == EditorInfo.IME_ACTION_NEXT) {

                performEditorAction(EditorInfo.IME_ACTION_NEXT);

                break;

            }

            mSpaceState = SPACE_STATE_NONE;

            if (mSettingsValues.isWordSeparator(primaryCode)) {

                didAutoCorrect = handleSeparator(primaryCode, x, y, spaceState);