commit 95f397adb13aa69b15b53bb089078d4dbdb269f1
author James Dong <jdong@google.com> Fri May 27 11:26:24 2011 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Fri May 27 11:26:24 2011 -0700
tree fd4a9e8e7c036c10cc35ded531fbb3476491e4b6
parent 241c000cfb9299b4c6cfe3c7c1610f950d1a6e58
parent f1d8a30c95909a2c6405d45637f6ce95a21b57dd

Merge "Revert "DO NOT MERGE Correctly implement the CLEAR xfermode."" into honeycomb-mr2

core/java/android/webkit/WebTextView.java

diff --git a/core/java/android/webkit/WebTextView.java b/core/java/android/webkit/WebTextView.java
index 0f24edc..d3e7290 100644
--- a/core/java/android/webkit/WebTextView.java
+++ b/core/java/android/webkit/WebTextView.java
@@ -1174,7 +1174,7 @@
                 imeOptions |= EditorInfo.IME_ACTION_SEARCH;
                 break;
             case EMAIL:
-                inputType = EditorInfo.TYPE_TEXT_VARIATION_WEB_EMAIL_ADDRESS;
+                inputType |= EditorInfo.TYPE_TEXT_VARIATION_WEB_EMAIL_ADDRESS;
                 imeOptions |= EditorInfo.IME_ACTION_GO;
                 break;
             case NUMBER: