Merge "Add ui resources mapping for autofill" into master-chromium

2 files changed, 15 insertions, 1 deletions

diff --git a/chromium/java/com/android/webview/chromium/ResourceProvider.java b/chromium/java/com/android/webview/chromium/ResourceProvider.java
index 304f1d0..00560e1 100644
--- a/chromium/java/com/android/webview/chromium/ResourceProvider.java
+++ b/chromium/java/com/android/webview/chromium/ResourceProvider.java
@@ -85,6 +85,10 @@ public class ResourceProvider {
                 com.android.internal.R.id.webviewchromium_color_picker_text;
         org.chromium.ui.R.id.seek_bar =
                 com.android.internal.R.id.webviewchromium_color_picker_seek_bar;
+        org.chromium.ui.R.id.autofill_label =
+                com.android.internal.R.id.webviewchromium_autofill_label;
+        org.chromium.ui.R.id.autofill_sublabel =
+                com.android.internal.R.id.webviewchromium_autofill_sublabel;
 
         // layout
 
@@ -99,6 +103,8 @@ public class ResourceProvider {
                 com.android.internal.R.layout.webviewchromium_color_picker_dialog_content;
         org.chromium.ui.R.layout.color_picker_advanced_component =
                 com.android.internal.R.layout.webviewchromium_color_picker_advanced_component;
+        org.chromium.ui.R.layout.autofill_text =
+                com.android.internal.R.layout.webviewchromium_autofill_text;
 
         // string
 
@@ -160,6 +166,11 @@ public class ResourceProvider {
         org.chromium.ui.R.string.color_picker_dialog_title =
                 com.android.internal.R.string.webviewchromium_color_picker_dialog_title;
 
+        // style
+
+        org.chromium.ui.R.style.AutofillPopupWindow =
+                com.android.internal.R.style.webviewchromium_AutofillPopupWindow;
+
         if (Build.IS_DEBUGGABLE) {
             // Ensure that we aren't missing any resource mappings.
             verifyFields(org.chromium.content.R.class);
diff --git a/chromium/java/com/android/webview/chromium/WebViewChromium.java b/chromium/java/com/android/webview/chromium/WebViewChromium.java
index 9b35a50..8bfd2c5 100644
--- a/chromium/java/com/android/webview/chromium/WebViewChromium.java
+++ b/chromium/java/com/android/webview/chromium/WebViewChromium.java
@@ -458,9 +458,12 @@ class WebViewChromium implements WebViewProvider,
         mAwContents.clearCache(includeDiskFiles);
     }
 
+    /**
+     * This is a poorly named method, but we keep it for historical reasons.
+     */
     @Override
     public void clearFormData() {
-        UnimplementedWebViewApi.invoke();
+        mAwContents.hideAutofillPopup();
     }
 
     @Override