diff options
| author | Ben Murdoch <benm@google.com> | 2011-07-11 11:17:10 +0100 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2011-07-12 14:54:40 +0100 |
| commit | 06da76bd2d1bfaf8000f6679ffd49d801ecf482a (patch) | |
| tree | a5a76bfe7057dc88628b13745a8a62bd97b6bcdb | |
| parent | bfcc5953078bcc638d69b9d32f6d0252a3d62702 (diff) | |
| download | frameworks_base-06da76bd2d1bfaf8000f6679ffd49d801ecf482a.zip frameworks_base-06da76bd2d1bfaf8000f6679ffd49d801ecf482a.tar.gz frameworks_base-06da76bd2d1bfaf8000f6679ffd49d801ecf482a.tar.bz2 | |
Add missing auto-fill strings.
These strings had a defintion native side, but no corresponding
definition java side which would lead to a crash. Strings taken from
chrome/app/generated_resources.grd - see
http://src.chromium.org/viewvc/chrome/trunk/src/chrome/app/generated_resources.grd?r1=75912&r2=76117&pathrev=88489
Also note that credit_card_number_preview_format is no longer needed.
See also change Ib861245e26197938bb2c5cf0f99c1d797ab0fbf2
Change-Id: I829b5d24e6f9a04211ee91c3f670c8659c004cd9
| -rw-r--r-- | core/java/android/webkit/L10nUtils.java | 13 | ||||
| -rwxr-xr-x | core/res/res/values/strings.xml | 38 |
2 files changed, 47 insertions, 4 deletions
diff --git a/core/java/android/webkit/L10nUtils.java b/core/java/android/webkit/L10nUtils.java index f9d0067d..a1c6a53 100644 --- a/core/java/android/webkit/L10nUtils.java +++ b/core/java/android/webkit/L10nUtils.java @@ -75,7 +75,18 @@ public class L10nUtils { 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 - com.android.internal.R.string.credit_card_number_preview_format // IDS_CREDIT_CARD_NUMBER_PREVIEW_FORMAT + com.android.internal.R.string.autofill_province, // IDS_AUTOFILL_DIALOG_PROVINCE + com.android.internal.R.string.autofill_postal_code, // IDS_AUTOFILL_DIALOG_POSTAL_CODE + com.android.internal.R.string.autofill_state, // IDS_AUTOFILL_DIALOG_STATE + com.android.internal.R.string.autofill_zip_code, // IDS_AUTOFILL_DIALOG_ZIP_CODE + com.android.internal.R.string.autofill_county, // IDS_AUTOFILL_DIALOG_COUNTY + com.android.internal.R.string.autofill_island, // IDS_AUTOFILL_DIALOG_ISLAND + com.android.internal.R.string.autofill_district, // IDS_AUTOFILL_DIALOG_DISTRICT + com.android.internal.R.string.autofill_department, // IDS_AUTOFILL_DIALOG_DEPARTMENT + com.android.internal.R.string.autofill_prefecture, // IDS_AUTOFILL_DIALOG_PREFECTURE + com.android.internal.R.string.autofill_parish, // IDS_AUTOFILL_DIALOG_PARISH + com.android.internal.R.string.autofill_area, // IDS_AUTOFILL_DIALOG_AREA + com.android.internal.R.string.autofill_emirate // IDS_AUTOFILL_DIALOG_EMIRATE }; private static Context mApplicationContext; diff --git a/core/res/res/values/strings.xml b/core/res/res/values/strings.xml index 145c34b..70c204e 100755 --- a/core/res/res/values/strings.xml +++ b/core/res/res/values/strings.xml @@ -2085,9 +2085,41 @@ <!-- Do not translate. Regex used by AutoFill. --> <string name="autofill_phone_suffix_separator_re">^-$</string> - <!-- Do not translate. Regex used by AutoFill. --> - <!-- Ex: ************1234 --> - <string name="credit_card_number_preview_format">$1</string> + <!-- Label in a web form for "Province" [CHAR-LIMIT=NONE] --> + <string name="autofill_province">Province</string> + + <!-- Label in a web form for "Postal code" [CHAR-LIMIT=NONE] --> + <string name="autofill_postal_code">Postal code</string> + + <!-- Label in a web form for "State" [CHAR-LIMIT=NONE] --> + <string name="autofill_state">State</string> + + <!-- Label in a web form for "ZIP code" [CHAR-LIMIT=NONE] --> + <string name="autofill_zip_code">ZIP code</string> + + <!-- Label in a web form for "County" [CHAR-LIMIT=NONE] --> + <string name="autofill_county">County</string> + + <!-- Label in a web form for "Island" [CHAR-LIMIT=NONE] --> + <string name="autofill_island">Island</string> + + <!-- Label in a web form for "District" [CHAR-LIMIT=NONE] --> + <string name="autofill_district">District</string> + + <!-- Label in a web form for "Department" [CHAR-LIMIT=NONE] --> + <string name="autofill_department">Department</string> + + <!-- Label in a web form for "Prefecture" [CHAR-LIMIT=NONE] --> + <string name="autofill_prefecture">Prefecture</string> + + <!-- Label in a web form for "Parish" [CHAR-LIMIT=NONE] --> + <string name="autofill_parish">Parish</string> + + <!-- Label in a web form for "Area" [CHAR-LIMIT=NONE] --> + <string name="autofill_area">Area</string> + + <!-- Label in a web form for "Emirate" [CHAR-LIMIT=NONE] --> + <string name="autofill_emirate">Emirate</string> <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. --> |