summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--core/java/android/webkit/WebSettings.java15
-rw-r--r--core/java/android/webkit/WebTextView.java3
2 files changed, 17 insertions, 1 deletions
diff --git a/core/java/android/webkit/WebSettings.java b/core/java/android/webkit/WebSettings.java
index 63fc008bf87c..20aafbd645fa 100644
--- a/core/java/android/webkit/WebSettings.java
+++ b/core/java/android/webkit/WebSettings.java
@@ -207,6 +207,7 @@ public class WebSettings {
private RenderPriority mRenderPriority = RenderPriority.NORMAL;
private int mOverrideCacheMode = LOAD_DEFAULT;
private boolean mSaveFormData = true;
+ private boolean mAutoFillEnabled = false;
private boolean mSavePassword = true;
private boolean mLightTouchEnabled = false;
private boolean mNeedInitialFocus = true;
@@ -596,6 +597,20 @@ public class WebSettings {
}
/**
+ * @hide
+ */
+ public void setAutoFillEnabled(boolean enabled) {
+ mAutoFillEnabled = enabled;
+ }
+
+ /**
+ * @hide
+ */
+ public boolean getAutoFillEnabled() {
+ return mAutoFillEnabled;
+ }
+
+ /**
* Store whether the WebView is saving password.
*/
public void setSavePassword(boolean save) {
diff --git a/core/java/android/webkit/WebTextView.java b/core/java/android/webkit/WebTextView.java
index 65daae660e30..1aff17031b4a 100644
--- a/core/java/android/webkit/WebTextView.java
+++ b/core/java/android/webkit/WebTextView.java
@@ -137,7 +137,8 @@ import java.util.ArrayList;
}
public void setAutoFillable(int queryId) {
- mAutoFillable = (queryId != FORM_NOT_AUTOFILLABLE);
+ mAutoFillable = mWebView.getSettings().getAutoFillEnabled()
+ && (queryId != FORM_NOT_AUTOFILLABLE);
mQueryId = queryId;
}