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

Commit 7cec24f7 authored by Kristian Monsen's avatar Kristian Monsen Committed by Android (Google) Code Review
Browse files

Merge "Merge Chromium at r12.0.742.93: New autofill string"

parents 532fee45 918b1832

core/java/android/webkit/L10nUtils.java

+2 −1
Original line number Diff line number Diff line
@@ -74,7 +74,8 @@ public class L10nUtils { 
        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

        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

    };



    private static Context mApplicationContext;

core/res/res/values/strings.xml

+4 −0
Original line number Diff line number Diff line
@@ -2085,6 +2085,10 @@ 
    <!-- 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>



    <!-- 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>