nyancrimew/LatinIME
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge "Disable showing TAB key when navigate flags are specified"

Browse source
This commit is contained in:
Tadashi G. Takaoka 2011-06-17 05:27:35 -07:00 committed by Android (Google) Code Review
commit 8f5a3842e6
2 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
java/src/com/android/inputmethod/keyboard/KeyboardId.java
View file

@ -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;

5
java/src/com/android/inputmethod/latin/LatinIME.java
View file

@ -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) {