aboutsummaryrefslogtreecommitdiffstats
path: root/java/src/com/android/inputmethod/latin/InputAttributes.java
diff options
context:
space:
mode:
authorKen Wakasa <kwakasa@google.com>2012-11-20 19:41:21 +0900
committerKen Wakasa <kwakasa@google.com>2012-11-20 19:41:21 +0900
commit76e5188f4e62e07c235b36ab466de6ad1cf56054 (patch)
tree844a354c60f1f4d52f473f8872231526f49763a7 /java/src/com/android/inputmethod/latin/InputAttributes.java
parent7608a4d76124ec5054df876b953a6d566dfa5e97 (diff)
parentd2266d22c93df2a1850024a53aa2824e0cb0f104 (diff)
downloadlatinime-76e5188f4e62e07c235b36ab466de6ad1cf56054.tar.gz
latinime-76e5188f4e62e07c235b36ab466de6ad1cf56054.tar.xz
latinime-76e5188f4e62e07c235b36ab466de6ad1cf56054.zip
Merge remote-tracking branch 'goog/master' into mergescriptpackage
Diffstat (limited to 'java/src/com/android/inputmethod/latin/InputAttributes.java')
-rw-r--r--java/src/com/android/inputmethod/latin/InputAttributes.java80
1 files changed, 50 insertions, 30 deletions
diff --git a/java/src/com/android/inputmethod/latin/InputAttributes.java b/java/src/com/android/inputmethod/latin/InputAttributes.java
index 2f7608a03..6c1e0301a 100644
--- a/java/src/com/android/inputmethod/latin/InputAttributes.java
+++ b/java/src/com/android/inputmethod/latin/InputAttributes.java
@@ -112,36 +112,56 @@ public final class InputAttributes {
if (inputClass == InputType.TYPE_CLASS_DATETIME)
Log.i(TAG, " TYPE_CLASS_DATETIME");
Log.i(TAG, "Variation:");
- if (0 != (inputType & InputType.TYPE_TEXT_VARIATION_EMAIL_ADDRESS))
- Log.i(TAG, " TYPE_TEXT_VARIATION_EMAIL_ADDRESS");
- if (0 != (inputType & InputType.TYPE_TEXT_VARIATION_EMAIL_SUBJECT))
- Log.i(TAG, " TYPE_TEXT_VARIATION_EMAIL_SUBJECT");
- if (0 != (inputType & InputType.TYPE_TEXT_VARIATION_FILTER))
- Log.i(TAG, " TYPE_TEXT_VARIATION_FILTER");
- if (0 != (inputType & InputType.TYPE_TEXT_VARIATION_LONG_MESSAGE))
- Log.i(TAG, " TYPE_TEXT_VARIATION_LONG_MESSAGE");
- if (0 != (inputType & InputType.TYPE_TEXT_VARIATION_NORMAL))
- Log.i(TAG, " TYPE_TEXT_VARIATION_NORMAL");
- if (0 != (inputType & InputType.TYPE_TEXT_VARIATION_PASSWORD))
- Log.i(TAG, " TYPE_TEXT_VARIATION_PASSWORD");
- if (0 != (inputType & InputType.TYPE_TEXT_VARIATION_PERSON_NAME))
- Log.i(TAG, " TYPE_TEXT_VARIATION_PERSON_NAME");
- if (0 != (inputType & InputType.TYPE_TEXT_VARIATION_PHONETIC))
- Log.i(TAG, " TYPE_TEXT_VARIATION_PHONETIC");
- if (0 != (inputType & InputType.TYPE_TEXT_VARIATION_POSTAL_ADDRESS))
- Log.i(TAG, " TYPE_TEXT_VARIATION_POSTAL_ADDRESS");
- if (0 != (inputType & InputType.TYPE_TEXT_VARIATION_SHORT_MESSAGE))
- Log.i(TAG, " TYPE_TEXT_VARIATION_SHORT_MESSAGE");
- if (0 != (inputType & InputType.TYPE_TEXT_VARIATION_URI))
- Log.i(TAG, " TYPE_TEXT_VARIATION_URI");
- if (0 != (inputType & InputType.TYPE_TEXT_VARIATION_VISIBLE_PASSWORD))
- Log.i(TAG, " TYPE_TEXT_VARIATION_VISIBLE_PASSWORD");
- if (0 != (inputType & InputType.TYPE_TEXT_VARIATION_WEB_EDIT_TEXT))
- Log.i(TAG, " TYPE_TEXT_VARIATION_WEB_EDIT_TEXT");
- if (0 != (inputType & InputType.TYPE_TEXT_VARIATION_WEB_EMAIL_ADDRESS))
- Log.i(TAG, " TYPE_TEXT_VARIATION_WEB_EMAIL_ADDRESS");
- if (0 != (inputType & InputType.TYPE_TEXT_VARIATION_WEB_PASSWORD))
- Log.i(TAG, " TYPE_TEXT_VARIATION_WEB_PASSWORD");
+ switch (InputType.TYPE_MASK_VARIATION & inputType) {
+ case InputType.TYPE_TEXT_VARIATION_EMAIL_ADDRESS:
+ Log.i(TAG, " TYPE_TEXT_VARIATION_EMAIL_ADDRESS");
+ break;
+ case InputType.TYPE_TEXT_VARIATION_EMAIL_SUBJECT:
+ Log.i(TAG, " TYPE_TEXT_VARIATION_EMAIL_SUBJECT");
+ break;
+ case InputType.TYPE_TEXT_VARIATION_FILTER:
+ Log.i(TAG, " TYPE_TEXT_VARIATION_FILTER");
+ break;
+ case InputType.TYPE_TEXT_VARIATION_LONG_MESSAGE:
+ Log.i(TAG, " TYPE_TEXT_VARIATION_LONG_MESSAGE");
+ break;
+ case InputType.TYPE_TEXT_VARIATION_NORMAL:
+ Log.i(TAG, " TYPE_TEXT_VARIATION_NORMAL");
+ break;
+ case InputType.TYPE_TEXT_VARIATION_PASSWORD:
+ Log.i(TAG, " TYPE_TEXT_VARIATION_PASSWORD");
+ break;
+ case InputType.TYPE_TEXT_VARIATION_PERSON_NAME:
+ Log.i(TAG, " TYPE_TEXT_VARIATION_PERSON_NAME");
+ break;
+ case InputType.TYPE_TEXT_VARIATION_PHONETIC:
+ Log.i(TAG, " TYPE_TEXT_VARIATION_PHONETIC");
+ break;
+ case InputType.TYPE_TEXT_VARIATION_POSTAL_ADDRESS:
+ Log.i(TAG, " TYPE_TEXT_VARIATION_POSTAL_ADDRESS");
+ break;
+ case InputType.TYPE_TEXT_VARIATION_SHORT_MESSAGE:
+ Log.i(TAG, " TYPE_TEXT_VARIATION_SHORT_MESSAGE");
+ break;
+ case InputType.TYPE_TEXT_VARIATION_URI:
+ Log.i(TAG, " TYPE_TEXT_VARIATION_URI");
+ break;
+ case InputType.TYPE_TEXT_VARIATION_VISIBLE_PASSWORD:
+ Log.i(TAG, " TYPE_TEXT_VARIATION_VISIBLE_PASSWORD");
+ break;
+ case InputType.TYPE_TEXT_VARIATION_WEB_EDIT_TEXT:
+ Log.i(TAG, " TYPE_TEXT_VARIATION_WEB_EDIT_TEXT");
+ break;
+ case InputType.TYPE_TEXT_VARIATION_WEB_EMAIL_ADDRESS:
+ Log.i(TAG, " TYPE_TEXT_VARIATION_WEB_EMAIL_ADDRESS");
+ break;
+ case InputType.TYPE_TEXT_VARIATION_WEB_PASSWORD:
+ Log.i(TAG, " TYPE_TEXT_VARIATION_WEB_PASSWORD");
+ break;
+ default:
+ Log.i(TAG, " Unknown variation");
+ break;
+ }
Log.i(TAG, "Flags:");
if (0 != (inputType & InputType.TYPE_TEXT_FLAG_NO_SUGGESTIONS))
Log.i(TAG, " TYPE_TEXT_FLAG_NO_SUGGESTIONS");