commit e7c2d1c99c165fac57486d472809dc45f920263c
author Tadashi G. Takaoka <takaoka@google.com> Thu Sep 18 06:15:41 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Thu Sep 18 06:15:41 2014 +0000
tree abf755848dc8cc0247978183748934a4e71fffac
parent ace9c1485251ef63f37e5cde4fc5f6d7620f3386
parent 902cefb6635053b682a917259eb5a964a17506fd

am 902cefb6: am 97ad4968: am bfabac44: Suppress voice input key on textWebEmailAddress field

* commit '902cefb6635053b682a917259eb5a964a17506fd':
  Suppress voice input key on textWebEmailAddress field

java/src/com/android/inputmethod/latin/InputAttributes.java

diff --git a/java/src/com/android/inputmethod/latin/InputAttributes.java b/java/src/com/android/inputmethod/latin/InputAttributes.java
index 50a6e48..ffd363b 100644
--- a/java/src/com/android/inputmethod/latin/InputAttributes.java
+++ b/java/src/com/android/inputmethod/latin/InputAttributes.java
@@ -112,7 +112,7 @@
         mShouldInsertSpacesAutomatically = InputTypeUtils.isAutoSpaceFriendlyType(inputType);
 
         final boolean noMicrophone = mIsPasswordField
-                || InputType.TYPE_TEXT_VARIATION_EMAIL_ADDRESS == variation
+                || InputTypeUtils.isEmailVariation(variation)
                 || InputType.TYPE_TEXT_VARIATION_URI == variation
                 || hasNoMicrophoneKeyOption();
         mShouldShowVoiceInputKey = !noMicrophone;