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

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

Merge "Fix tab key's navigation behavior"

parents 133bb854 b28934ad

java/res/xml-sw600dp/key_styles_common.xml

+11 −0
Original line number Diff line number Diff line
@@ -133,6 +133,17 @@ 
                latin:keyIconPreview="!icon/tab_key_preview"

                latin:backgroundType="functional" />

        </case>

        <case

            latin:keyboardLayoutSetElement="alphabet|alphabetAutomaticShifted|alphabetShiftLocked"

            latin:navigateNext="true"

        >

            <key-style

                latin:styleName="tabKeyStyle"

                latin:code="!code/key_action_next"

                latin:keyIcon="!icon/tab_key"

                latin:keyIconPreview="!icon/tab_key_preview"

                latin:backgroundType="functional" />

        </case>

        <default>

            <key-style

                latin:styleName="tabKeyStyle"

java/res/xml-sw768dp/key_styles_common.xml

+11 −0
Original line number Diff line number Diff line
@@ -117,6 +117,17 @@ 
                latin:keyLabelFlags="fontNormal|preserveCase"

                latin:backgroundType="functional" />

        </case>

        <case

            latin:keyboardLayoutSetElement="alphabet|alphabetAutomaticShifted|alphabetShiftLocked"

            latin:navigateNext="true"

        >

            <key-style

                latin:styleName="tabKeyStyle"

                latin:code="!code/key_action_next"

                latin:keyLabel="!text/label_tab_key"

                latin:keyLabelFlags="fontNormal|preserveCase"

                latin:backgroundType="functional" />

        </case>

        <default>

            <key-style

                latin:styleName="tabKeyStyle"

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

+4 −2
Original line number Diff line number Diff line
@@ -137,11 +137,13 @@ public class KeyboardId { 
    }



    public boolean navigateNext() {

        return (mEditorInfo.imeOptions & EditorInfo.IME_FLAG_NAVIGATE_NEXT) != 0;

        return (mEditorInfo.imeOptions & EditorInfo.IME_FLAG_NAVIGATE_NEXT) != 0

                || imeAction() == EditorInfo.IME_ACTION_NEXT;

    }



    public boolean navigatePrevious() {

        return (mEditorInfo.imeOptions & EditorInfo.IME_FLAG_NAVIGATE_PREVIOUS) != 0;

        return (mEditorInfo.imeOptions & EditorInfo.IME_FLAG_NAVIGATE_PREVIOUS) != 0

                || imeAction() == EditorInfo.IME_ACTION_PREVIOUS;

    }



    public boolean passwordInput() {

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

+0 −3
Original line number Diff line number Diff line
@@ -29,7 +29,6 @@ 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;
@@ -92,8 +91,6 @@ 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

+0 −4
Original line number Diff line number Diff line
@@ -1276,10 +1276,6 @@ public class LatinIME extends InputMethodService implements KeyboardActionListen 
            }

            break;

        default:

            if (primaryCode == Keyboard.CODE_TAB && mCurrentSettings.isEditorActionNext()) {

                performEditorAction(EditorInfo.IME_ACTION_NEXT);

                break;

            }

            mSpaceState = SPACE_STATE_NONE;

            if (mCurrentSettings.isWordSeparator(primaryCode)) {

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