diff options
| author | Tadashi G. Takaoka <takaoka@google.com> | 2011-05-27 10:48:52 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-05-27 10:48:52 -0700 |
| commit | e0a82fcc6058e6297d11a040aae13e37a2439c14 (patch) | |
| tree | 110ee0285ab34f8853615d8aa131056b9835fef0 /core | |
| parent | de43d71bee336874a756545468d9adcf5e96e421 (diff) | |
| parent | 241c000cfb9299b4c6cfe3c7c1610f950d1a6e58 (diff) | |
| download | frameworks_base-e0a82fcc6058e6297d11a040aae13e37a2439c14.zip frameworks_base-e0a82fcc6058e6297d11a040aae13e37a2439c14.tar.gz frameworks_base-e0a82fcc6058e6297d11a040aae13e37a2439c14.tar.bz2 | |
am 241c000c: Merge "Fix InputType determination of WebTextView (DO NOT MERGE)" into honeycomb-mr2
* commit '241c000cfb9299b4c6cfe3c7c1610f950d1a6e58':
Fix InputType determination of WebTextView (DO NOT MERGE)
Diffstat (limited to 'core')
| -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 0f24edc..d3e7290 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: |