diff options
| author | Kristian Monsen <kristianm@google.com> | 2011-07-01 08:04:11 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-07-01 08:04:11 -0700 |
| commit | 5faaadffbfb272f6a5f686834dadaf5408cf0ed2 (patch) | |
| tree | 284a1845b6e43890e7dbf90a07423f726a0e295b /core/java/android/webkit | |
| parent | de89a4645822996e8d751d16c27f9e584f993076 (diff) | |
| parent | 6f38f0f68e51e81824daba05aa2d618b4a25b411 (diff) | |
| download | frameworks_base-5faaadffbfb272f6a5f686834dadaf5408cf0ed2.zip frameworks_base-5faaadffbfb272f6a5f686834dadaf5408cf0ed2.tar.gz frameworks_base-5faaadffbfb272f6a5f686834dadaf5408cf0ed2.tar.bz2 | |
Merge changes I7e8401a4,I412ddf36
* changes:
Merge Chromium at r11.0.696.0: New autofill strings
Merge Chromium at r11.0.696.0: Using setter instead of direct variable access
Diffstat (limited to 'core/java/android/webkit')
| -rw-r--r-- | core/java/android/webkit/L10nUtils.java | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/core/java/android/webkit/L10nUtils.java b/core/java/android/webkit/L10nUtils.java index 5b4fb1d..4c42cde 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; |