summaryrefslogtreecommitdiff
path: root/chromium/java/com/android/webview
diff options
context:
space:
mode:
authorSelim Gurun <sgurun@google.com>2013-05-31 16:38:22 -0700
committerSelim Gurun <sgurun@google.com>2013-06-26 16:03:13 -0700
commitbbef8de5696d48fc6458c926026fc524a62814e1 (patch)
tree799be7245f2a5d279d06127cf1ea832caaf0a8f9 /chromium/java/com/android/webview
parentc3d28c85f3c7710e9af4a8c404426aac2a3721b1 (diff)
downloadwebview-bbef8de5696d48fc6458c926026fc524a62814e1.tar.gz
Add ui resources mapping for autofill
Add mapping for ui resources to the glue layer. This CL depends on https://codereview.chromium.org/16212007/. Bug: 5013406 Change-Id: Ia5a51b1f2fbaafa63efebbc5f2c25ce8ffa53527
Diffstat (limited to 'chromium/java/com/android/webview')
-rw-r--r--chromium/java/com/android/webview/chromium/ResourceProvider.java11
-rw-r--r--chromium/java/com/android/webview/chromium/WebViewChromium.java5
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 c020f6b..b8af043 100644
--- a/chromium/java/com/android/webview/chromium/WebViewChromium.java
+++ b/chromium/java/com/android/webview/chromium/WebViewChromium.java
@@ -448,9 +448,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