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

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

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
parents de89a464 6f38f0f6

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
@@ -2073,6 +2073,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>

media/libstagefright/chromium_http/support.cpp

+17 −17
Original line number Diff line number Diff line
@@ -115,31 +115,31 @@ SfRequestContext::SfRequestContext() { 


    mUserAgent = ua.c_str();



    net_log_ = new SfNetLog;

    set_net_log(new SfNetLog());



    host_resolver_ =

    set_host_resolver(

        net::CreateSystemHostResolver(

                net::HostResolver::kDefaultParallelism,

                NULL /* resolver_proc */,

                net_log_);

                net_log()));



    ssl_config_service_ =

        net::SSLConfigService::CreateSystemSSLConfigService();

    set_ssl_config_service(

        net::SSLConfigService::CreateSystemSSLConfigService());



    proxy_service_ = net::ProxyService::CreateWithoutProxyResolver(

            new net::ProxyConfigServiceAndroid, net_log_);

    set_proxy_service(net::ProxyService::CreateWithoutProxyResolver(

        new net::ProxyConfigServiceAndroid, net_log()));



    http_transaction_factory_ = new net::HttpCache(

            host_resolver_,

    set_http_transaction_factory(new net::HttpCache(

            host_resolver(),

            new net::CertVerifier(),

            dnsrr_resolver_,

            dns_cert_checker_.get(),

            proxy_service_.get(),

            ssl_config_service_.get(),

            net::HttpAuthHandlerFactory::CreateDefault(host_resolver_),

            network_delegate_,

            net_log_,

            NULL);  // backend_factory

            dnsrr_resolver(),

            dns_cert_checker(),

            proxy_service(),

            ssl_config_service(),

            net::HttpAuthHandlerFactory::CreateDefault(host_resolver()),

            network_delegate(),

            net_log(),

            NULL));  // backend_factory

}



const std::string &SfRequestContext::GetUserAgent(const GURL &url) const {