Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6f38f0f6 authored by Kristian Monsen's avatar Kristian Monsen
Browse files

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
parent d2a1ebc3

core/java/android/webkit/L10nUtils.java

+5 −1
Original line number Diff line number Diff line
@@ -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;

core/res/res/values/strings.xml

+12 −0
Original line number Diff line number Diff line
@@ -2068,6 +2068,18 @@ 
    <!-- Do not translate. Regex used by AutoFill. -->

    <string name="autofill_fax_re">fax<!-- fr-FR -->|télécopie|telecopie<!-- ja-JP -->|ファックス<!-- ru -->|факс<!-- zh-CN -->|传真<!-- zh-TW -->|傳真</string>



    <!-- Do not translate. Regex used by AutoFill. -->

    <string name="autofill_country_code_re">country.*code|ccode|_cc</string>



    <!-- Do not translate. Regex used by AutoFill. -->

    <string name="autofill_area_code_notext_re">^\($</string>



    <!-- Do not translate. Regex used by AutoFill. -->

    <string name="autofill_phone_prefix_separator_re">^-$|^\)$</string>



    <!-- Do not translate. Regex used by AutoFill. -->

    <string name="autofill_phone_suffix_separator_re">^-$</string>



    <!-- Title of an application permission, listed so the user can choose whether

        they want to allow the application to do this. -->

    <string name="permlab_readHistoryBookmarks">read Browser\'s history and bookmarks</string>