summaryrefslogtreecommitdiff
path: root/core/java/android/webkit/WebTextView.java
diff options
context:
space:
mode:
authorLeon Scroggins <scroggo@google.com>2011-01-05 15:12:55 -0500
committerLeon Scroggins <scroggo@google.com>2011-01-05 15:42:20 -0500
commitae0238cae5aa3656c4da128c8951cedc902e6092 (patch)
tree9792cffe2621089de2178edc7a23480e1a47a3ca /core/java/android/webkit/WebTextView.java
parent3dbf55c3a2d993b89d0947885061cf8421930639 (diff)
Do not show past entries if autocomplete=off.
Bug:3300365 Requires a change in external/webkit. Change-Id: I2f15d9dfce1002d0bf7a77a14605769fd654aa51
Diffstat (limited to 'core/java/android/webkit/WebTextView.java')
-rw-r--r--core/java/android/webkit/WebTextView.java6
1 files changed, 4 insertions, 2 deletions
diff --git a/core/java/android/webkit/WebTextView.java b/core/java/android/webkit/WebTextView.java
index cf447dbfbe03..4c2f0b459806 100644
--- a/core/java/android/webkit/WebTextView.java
+++ b/core/java/android/webkit/WebTextView.java
@@ -1177,10 +1177,12 @@ import junit.framework.Assert;
mWebView.requestLabel(mWebView.nativeFocusCandidateFramePointer(),
mNodePointer);
maxLength = mWebView.nativeFocusCandidateMaxLength();
- if (type != PASSWORD) {
+ boolean autoComplete = mWebView.nativeFocusCandidateIsAutoComplete();
+ if (type != PASSWORD && (mAutoFillable || autoComplete)) {
String name = mWebView.nativeFocusCandidateName();
if (name != null && name.length() > 0) {
- mWebView.requestFormData(name, mNodePointer, mAutoFillable);
+ mWebView.requestFormData(name, mNodePointer, mAutoFillable,
+ autoComplete);
}
}
}