From ae0238cae5aa3656c4da128c8951cedc902e6092 Mon Sep 17 00:00:00 2001
From: Leon Scroggins <scroggo@google.com>
Date: Wed, 5 Jan 2011 15:12:55 -0500
Subject: Do not show past entries if autocomplete=off.

Bug:3300365

Requires a change in external/webkit.

Change-Id: I2f15d9dfce1002d0bf7a77a14605769fd654aa51
---
 core/java/android/webkit/WebTextView.java | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'core/java/android/webkit/WebTextView.java')

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);
                 }
             }
         }
-- 
cgit v1.2.3