diff options
| author |   Tadashi G. Takaoka <takaoka@google.com> | 2011-06-17 20:55:46 +0900 |
|---|---|---|
| committer | Tadashi G. Takaoka <takaoka@google.com> | 2011-06-17 21:13:35 +0900 |
| commit | f0f726464dcb5b3cef4f8e703659b35ca62430b5 (patch) | |
| tree | 4e3ecbba492571ecf8b0c37da9eee41044df8fed /java/src | |
| parent | 144ba95813fe2acfe6da3851507d0a0c8b5bcb6c (diff) | |
| download | latinime-f0f726464dcb5b3cef4f8e703659b35ca62430b5.tar.gz latinime-f0f726464dcb5b3cef4f8e703659b35ca62430b5.tar.xz latinime-f0f726464dcb5b3cef4f8e703659b35ca62430b5.zip | |
Disable showing TAB key when navigate flags are specified
Bug: 3094312
Change-Id: Ibbd36020c1e40daab220b588e6c190979afe7149
Diffstat (limited to 'java/src')
| -rw-r--r-- | java/src/com/android/inputmethod/keyboard/KeyboardId.java | 11 | ||||
| -rw-r--r-- | java/src/com/android/inputmethod/latin/LatinIME.java | 5 |
2 files changed, 9 insertions, 7 deletions
diff --git a/java/src/com/android/inputmethod/keyboard/KeyboardId.java b/java/src/com/android/inputmethod/keyboard/KeyboardId.java index cdaed95a5..d97bb6730 100644 --- a/java/src/com/android/inputmethod/keyboard/KeyboardId.java +++ b/java/src/com/android/inputmethod/keyboard/KeyboardId.java @@ -16,12 +16,12 @@ package com.android.inputmethod.keyboard; +import android.view.inputmethod.EditorInfo; + import com.android.inputmethod.compat.EditorInfoCompatUtils; import com.android.inputmethod.compat.InputTypeCompatUtils; import com.android.inputmethod.latin.R; -import android.view.inputmethod.EditorInfo; - import java.util.Arrays; import java.util.Locale; @@ -67,9 +67,10 @@ public class KeyboardId { this.mMode = mode; this.mXmlId = xmlId; this.mColorScheme = colorScheme; - this.mNavigateAction = InputTypeCompatUtils.isWebInputType(inputType) - || EditorInfoCompatUtils.hasFlagNavigateNext(imeOptions) - || EditorInfoCompatUtils.hasFlagNavigatePrevious(imeOptions); + // Note: Turn off checking navigation flag to show TAB key for now. + this.mNavigateAction = InputTypeCompatUtils.isWebInputType(inputType); +// || EditorInfoCompatUtils.hasFlagNavigateNext(imeOptions) +// || EditorInfoCompatUtils.hasFlagNavigatePrevious(imeOptions); this.mPasswordInput = InputTypeCompatUtils.isPasswordInputType(inputType) || InputTypeCompatUtils.isVisiblePasswordInputType(inputType); this.mHasSettingsKey = hasSettingsKey; diff --git a/java/src/com/android/inputmethod/latin/LatinIME.java b/java/src/com/android/inputmethod/latin/LatinIME.java index 87912eb00..fc01d3976 100644 --- a/java/src/com/android/inputmethod/latin/LatinIME.java +++ b/java/src/com/android/inputmethod/latin/LatinIME.java @@ -518,8 +518,9 @@ public class LatinIME extends InputMethodServiceCompatWrapper implements Keyboar LatinKeyboardView inputView = switcher.getKeyboardView(); if (DEBUG) { - Log.d(TAG, "onStartInputView: inputType=" + ((attribute == null) ? "none" - : String.format("0x%08x", attribute.inputType))); + Log.d(TAG, "onStartInputView: attribute:" + ((attribute == null) ? "none" + : String.format("inputType=0x%08x imeOptions=0x%08x", + attribute.inputType, attribute.imeOptions))); } // In landscape mode, this method gets called without the input view being created. if (inputView == null) { |