From c25e07d21261583d0eeca5aa0fb6e3ffe93dc603 Mon Sep 17 00:00:00 2001
From: "Tadashi G. Takaoka" <takaoka@google.com>
Date: Sat, 28 May 2011 23:47:21 +0900
Subject: [PATCH] Fix web input type judgment
Bug: 4490948
Change-Id: I71efb8f5784970f1d2a94da1d2eb852f7f11885f
---
.../android/inputmethod/compat/InputTypeCompatUtils.java | 8 ++++++--
.../android/inputmethod/keyboard/KeyboardSwitcher.java | 4 ++--
2 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/java/src/com/android/inputmethod/compat/InputTypeCompatUtils.java b/java/src/com/android/inputmethod/compat/InputTypeCompatUtils.java
index 6684f6a8fd..6c2f0f7990 100644
--- a/java/src/com/android/inputmethod/compat/InputTypeCompatUtils.java
+++ b/java/src/com/android/inputmethod/compat/InputTypeCompatUtils.java
@@ -60,6 +60,11 @@ public class InputTypeCompatUtils {
: 0;
}
+ private static boolean isWebEditTextInputType(int inputType) {
+ return inputType == (InputType.TYPE_CLASS_TEXT
+ | InputType.TYPE_TEXT_VARIATION_WEB_EDIT_TEXT);
+ }
+
private static boolean isWebPasswordInputType(int inputType) {
return WEB_TEXT_PASSWORD_INPUT_TYPE != 0
&& inputType == WEB_TEXT_PASSWORD_INPUT_TYPE;
@@ -92,8 +97,7 @@ public class InputTypeCompatUtils {
public static boolean isWebInputType(int inputType) {
final int maskedInputType =
inputType & (InputType.TYPE_MASK_CLASS | InputType.TYPE_MASK_VARIATION);
- return maskedInputType == InputType.TYPE_TEXT_VARIATION_WEB_EDIT_TEXT
- || isWebPasswordInputType(maskedInputType)
+ return isWebEditTextInputType(maskedInputType) || isWebPasswordInputType(maskedInputType)
|| isWebEmailAddressInputType(maskedInputType);
}
diff --git a/java/src/com/android/inputmethod/keyboard/KeyboardSwitcher.java b/java/src/com/android/inputmethod/keyboard/KeyboardSwitcher.java
index 195c929fa5..2512118d48 100644
--- a/java/src/com/android/inputmethod/keyboard/KeyboardSwitcher.java
+++ b/java/src/com/android/inputmethod/keyboard/KeyboardSwitcher.java
@@ -39,8 +39,8 @@ import java.util.HashMap;
import java.util.Locale;
public class KeyboardSwitcher implements SharedPreferences.OnSharedPreferenceChangeListener {
- private static final String TAG = "KeyboardSwitcher";
- private static final boolean DEBUG_CACHE = false;
+ private static final String TAG = KeyboardSwitcher.class.getSimpleName();
+ private static final boolean DEBUG_CACHE = LatinImeLogger.sDBG;
public static final boolean DEBUG_STATE = false;
private static String sConfigDefaultKeyboardThemeId;
--
GitLab