diff options
| author | 2011-05-27 10:55:23 -0700 | |
|---|---|---|
| committer | 2011-05-27 10:55:23 -0700 | |
| commit | ccb2bc6c155c09e88e4fbbbd30382ae58c087ce5 (patch) | |
| tree | e442f961f2f9bf295ecae2cf2f0ead059b10481d | |
| parent | 092b0bd9b62e3b0fe07dfd4c5a0b3323ff95d2a0 (diff) | |
| parent | e0a82fcc6058e6297d11a040aae13e37a2439c14 (diff) | |
am e0a82fcc: am 241c000c: Merge "Fix InputType determination of WebTextView (DO NOT MERGE)" into honeycomb-mr2
* commit 'e0a82fcc6058e6297d11a040aae13e37a2439c14':
Fix InputType determination of WebTextView (DO NOT MERGE)
| -rw-r--r-- | core/java/android/webkit/WebTextView.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/java/android/webkit/WebTextView.java b/core/java/android/webkit/WebTextView.java index 0f24edc9e756..d3e7290da8c8 100644 --- a/core/java/android/webkit/WebTextView.java +++ b/core/java/android/webkit/WebTextView.java @@ -1174,7 +1174,7 @@ import junit.framework.Assert; 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: |