summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Michael Kolb <kolby@google.com> 2011-10-11 15:25:22 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 2011-10-11 15:25:22 -0700
commitf0f7a9139b40e9b90a2981aa7aba49fa2c24ca1d (patch)
treec8e153c1c706ab8e3ec04e3f1e18b70a51ed0161
parent78bbcd31aac4e6744a00ee0a6bd6ac5cc1bec673 (diff)
parent64b4f16adf8a46a848e864200d9f7f4f90441d32 (diff)
Merge "Support spellcheck attribute in WebTextView" into ics-mr0
-rw-r--r--core/java/android/webkit/WebTextView.java3
-rw-r--r--core/java/android/webkit/WebView.java1
2 files changed, 4 insertions, 0 deletions
diff --git a/core/java/android/webkit/WebTextView.java b/core/java/android/webkit/WebTextView.java
index 66371f5fc5dd..b0ecf092ea58 100644
--- a/core/java/android/webkit/WebTextView.java
+++ b/core/java/android/webkit/WebTextView.java
@@ -1002,6 +1002,9 @@ import junit.framework.Assert;
| InputType.TYPE_TEXT_VARIATION_WEB_EDIT_TEXT;
int imeOptions = EditorInfo.IME_FLAG_NO_EXTRACT_UI
| EditorInfo.IME_FLAG_NO_FULLSCREEN;
+ if (!mWebView.nativeFocusCandidateIsSpellcheck()) {
+ inputType |= InputType.TYPE_TEXT_FLAG_NO_SUGGESTIONS;
+ }
if (TEXT_AREA != type
&& mWebView.nativeFocusCandidateHasNextTextfield()) {
imeOptions |= EditorInfo.IME_FLAG_NAVIGATE_NEXT;
diff --git a/core/java/android/webkit/WebView.java b/core/java/android/webkit/WebView.java
index 6d19c23fd2cb..9648cd015d74 100644
--- a/core/java/android/webkit/WebView.java
+++ b/core/java/android/webkit/WebView.java
@@ -9459,6 +9459,7 @@ public class WebView extends AbsoluteLayout
private native boolean nativeFocusCandidateIsTextInput();
/* package */ native int nativeFocusCandidateMaxLength();
/* package */ native boolean nativeFocusCandidateIsAutoComplete();
+ /* package */ native boolean nativeFocusCandidateIsSpellcheck();
/* package */ native String nativeFocusCandidateName();
private native Rect nativeFocusCandidateNodeBounds();
/**