diff options
| author |   Tadashi G. Takaoka <takaoka@google.com> | 2012-05-08 06:43:05 -0700 |
|---|---|---|
| committer |   Android (Google) Code Review <android-gerrit@google.com> | 2012-05-08 06:43:05 -0700 |
| commit | f52aef84a582197d6f8e580044b2d24d2a710cef (patch) | |
| tree | bdb2a93cabb77c38ae9022658786ab3bfec045e0 /java/src | |
| parent | 47021b7a947a0bda6643ebad797f7487dcf6a9ce (diff) | |
| parent | 0b831ba2aaf7baf7be402f2245b225a04c28fada (diff) | |
| download | latinime-f52aef84a582197d6f8e580044b2d24d2a710cef.tar.gz latinime-f52aef84a582197d6f8e580044b2d24d2a710cef.tar.xz latinime-f52aef84a582197d6f8e580044b2d24d2a710cef.zip | |
Merge "Tab key preforms next action when EditorInfo.IME_ACTION_NEXT is specified" into jb-dev
Diffstat (limited to 'java/src')
| -rw-r--r-- | java/src/com/android/inputmethod/latin/InputAttributes.java | 3 | ||||
| -rw-r--r-- | java/src/com/android/inputmethod/latin/LatinIME.java | 5 |
2 files changed, 8 insertions, 0 deletions
diff --git a/java/src/com/android/inputmethod/latin/InputAttributes.java b/java/src/com/android/inputmethod/latin/InputAttributes.java index 9c32f947c..229ae2f3c 100644 --- a/java/src/com/android/inputmethod/latin/InputAttributes.java +++ b/java/src/com/android/inputmethod/latin/InputAttributes.java @@ -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") diff --git a/java/src/com/android/inputmethod/latin/LatinIME.java b/java/src/com/android/inputmethod/latin/LatinIME.java index 7232a4883..796d4ac79 100644 --- a/java/src/com/android/inputmethod/latin/LatinIME.java +++ b/java/src/com/android/inputmethod/latin/LatinIME.java @@ -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); |