diff options
| author |   Ken Wakasa <kwakasa@google.com> | 2014-09-13 09:25:23 +0900 |
|---|---|---|
| committer | Ken Wakasa <kwakasa@google.com> | 2014-09-13 09:25:23 +0900 |
| commit | 8ed81f9fd74d648fe0adc9ffc0bd2d247105ebe5 (patch) | |
| tree | 033b9c08832cad074d69b07033a535fb57e7e923 /java/src/com/android/inputmethod/latin/InputAttributes.java | |
| parent | 6297897fccf4628d83e206f0f75131b928eec529 (diff) | |
| parent | 8e9385cc0993da711e97881a4122f11041f15730 (diff) | |
| download | latinime-8ed81f9fd74d648fe0adc9ffc0bd2d247105ebe5.tar.gz latinime-8ed81f9fd74d648fe0adc9ffc0bd2d247105ebe5.tar.xz latinime-8ed81f9fd74d648fe0adc9ffc0bd2d247105ebe5.zip | |
resolved conflicts for merge of 8e9385cc to master
Change-Id: Ia6d192ee4a8496afa3f788894844ebef78fb7a8c
Diffstat (limited to 'java/src/com/android/inputmethod/latin/InputAttributes.java')
| -rw-r--r-- | java/src/com/android/inputmethod/latin/InputAttributes.java | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/java/src/com/android/inputmethod/latin/InputAttributes.java b/java/src/com/android/inputmethod/latin/InputAttributes.java index 782e18255..50a6e48e3 100644 --- a/java/src/com/android/inputmethod/latin/InputAttributes.java +++ b/java/src/com/android/inputmethod/latin/InputAttributes.java @@ -49,6 +49,7 @@ public final class InputAttributes { * {@link com.android.inputmethod.latin.settings.SettingsValues#mGestureFloatingPreviewTextEnabled} */ final public boolean mDisableGestureFloatingPreviewText; + final public boolean mIsGeneralTextInput; final private int mInputType; final private EditorInfo mEditorInfo; final private String mPackageNameForPrivateImeOptions; @@ -84,6 +85,7 @@ public final class InputAttributes { mShouldInsertSpacesAutomatically = false; mShouldShowVoiceInputKey = false; mDisableGestureFloatingPreviewText = false; + mIsGeneralTextInput = false; return; } // inputClass == InputType.TYPE_CLASS_TEXT @@ -128,6 +130,15 @@ public final class InputAttributes { || (!flagAutoCorrect && !flagMultiLine); mApplicationSpecifiedCompletionOn = flagAutoComplete && isFullscreenMode; + + // If we come here, inputClass is always TYPE_CLASS_TEXT + mIsGeneralTextInput = InputType.TYPE_TEXT_VARIATION_EMAIL_ADDRESS != variation + && InputType.TYPE_TEXT_VARIATION_PASSWORD != variation + && InputType.TYPE_TEXT_VARIATION_PHONETIC != variation + && InputType.TYPE_TEXT_VARIATION_URI != variation + && InputType.TYPE_TEXT_VARIATION_VISIBLE_PASSWORD != variation + && InputType.TYPE_TEXT_VARIATION_WEB_EMAIL_ADDRESS != variation + && InputType.TYPE_TEXT_VARIATION_WEB_PASSWORD != variation; } public boolean isTypeNull() { |