From f9b1a092b6c86549a8257015a03ea59ebcd9a85e Mon Sep 17 00:00:00 2001 From: Leon Scroggins Date: Wed, 31 Mar 2010 15:32:36 -0400 Subject: [PATCH] Only include WEB_EDIT if there are more textfields. Fixes http://b/issue?id=2559070 Requires a change to external/webkit. Change-Id: I411a04d260c781a91d16832704bb5c34e9751bc1 --- core/java/android/webkit/WebTextView.java | 6 ++++-- core/java/android/webkit/WebView.java | 1 + 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/core/java/android/webkit/WebTextView.java b/core/java/android/webkit/WebTextView.java index 016f0169261d..870f512c8b36 100644 --- a/core/java/android/webkit/WebTextView.java +++ b/core/java/android/webkit/WebTextView.java @@ -818,8 +818,10 @@ import java.util.ArrayList; boolean single = true; boolean inPassword = false; int maxLength = -1; - int inputType = EditorInfo.TYPE_CLASS_TEXT - | EditorInfo.TYPE_TEXT_VARIATION_WEB_EDIT_TEXT; + int inputType = EditorInfo.TYPE_CLASS_TEXT; + if (mWebView.nativeFocusCandidateHasNextTextfield()) { + inputType |= EditorInfo.TYPE_TEXT_VARIATION_WEB_EDIT_TEXT; + } int imeOptions = EditorInfo.IME_FLAG_NO_EXTRACT_UI | EditorInfo.IME_FLAG_NO_FULLSCREEN; switch (type) { diff --git a/core/java/android/webkit/WebView.java b/core/java/android/webkit/WebView.java index 0eb51775611d..0b79ac475270 100644 --- a/core/java/android/webkit/WebView.java +++ b/core/java/android/webkit/WebView.java @@ -7168,6 +7168,7 @@ public class WebView extends AbsoluteLayout private native int nativeFindAll(String findLower, String findUpper); private native void nativeFindNext(boolean forward); /* package */ native int nativeFocusCandidateFramePointer(); + /* package */ native boolean nativeFocusCandidateHasNextTextfield(); private native boolean nativeFocusCandidateIsPassword(); private native boolean nativeFocusCandidateIsRtlText(); private native boolean nativeFocusCandidateIsTextInput(); -- 2.11.0