summaryrefslogtreecommitdiff
path: root/core/java/android
diff options
context:
space:
mode:
authorKristian Monsen <kristianm@google.com>2011-06-21 21:34:04 +0100
committerKristian Monsen <kristianm@google.com>2011-06-30 13:48:14 +0100
commit6f38f0f68e51e81824daba05aa2d618b4a25b411 (patch)
tree719f7639d66265dcfb303424c35c15017940f139 /core/java/android
parentd2a1ebc35616e9dbc95d2bb94e060de40686350d (diff)
Merge Chromium at r11.0.696.0: New autofill strings
Corresponding native change: https://android-git.corp.google.com/g/#change,118079 Change-Id: I7e8401a4909c903ee4806825ff82a49e3cf6dacb
Diffstat (limited to 'core/java/android')
-rw-r--r--core/java/android/webkit/L10nUtils.java6
1 files changed, 5 insertions, 1 deletions
diff --git a/core/java/android/webkit/L10nUtils.java b/core/java/android/webkit/L10nUtils.java
index 5b4fb1df72de..4c42cde5b693 100644
--- a/core/java/android/webkit/L10nUtils.java
+++ b/core/java/android/webkit/L10nUtils.java
@@ -70,7 +70,11 @@ public class L10nUtils {
com.android.internal.R.string.autofill_expiration_month_re, // IDS_AUTOFILL_EXPIRATION_MONTH_RE
com.android.internal.R.string.autofill_expiration_date_re, // IDS_AUTOFILL_EXPIRATION_DATE_RE
com.android.internal.R.string.autofill_card_ignored_re, // IDS_AUTOFILL_CARD_IGNORED_RE
- com.android.internal.R.string.autofill_fax_re // IDS_AUTOFILL_FAX_RE
+ com.android.internal.R.string.autofill_fax_re, // IDS_AUTOFILL_FAX_RE
+ com.android.internal.R.string.autofill_country_code_re, // IDS_AUTOFILL_COUNTRY_CODE_RE
+ com.android.internal.R.string.autofill_area_code_notext_re, // IDS_AUTOFILL_AREA_CODE_NOTEXT_RE
+ com.android.internal.R.string.autofill_phone_prefix_separator_re, // IDS_AUTOFILL_PHONE_PREFIX_SEPARATOR_RE
+ com.android.internal.R.string.autofill_phone_suffix_separator_re // IDS_AUTOFILL_PHONE_SUFFIX_SEPARATOR_RE
};
private static Context mApplicationContext;