commit f21ae6ba8d6dd532b388906168b17ab825a1d4b7
author Tadashi G. Takaoka <takaoka@google.com> Thu Sep 18 06:07:54 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Thu Sep 18 06:07:54 2014 +0000
tree b04025a0b24f932913ec23d3b904fc0643f46ac7
parent 4cbfee7a412838bbb285b690d36fcc7a3e7d8350
parent 3e5c442c292bcf20722e9472976f3e320480f1b3

am 3e5c442c: am bfabac44: Suppress voice input key on textWebEmailAddress field

* commit '3e5c442c292bcf20722e9472976f3e320480f1b3':
  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 9df3a2a..fecb0ef 100644
--- a/java/src/com/android/inputmethod/latin/InputAttributes.java
+++ b/java/src/com/android/inputmethod/latin/InputAttributes.java
@@ -104,7 +104,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;