Commit 7baf512b authored by Natalie Chouinard's avatar Natalie Chouinard Committed by Commit Bot

[GoogleSans] Upstream Google Sans preloading

Copy downstream XML to preload Google Sans fonts from GMS Core to
upstream. This will be followed by CLs to cleanup downstream preloading
(crrev.com/i/3202583) and update downstream font references
(crrev.com/i/3202445).

The only change made in duplicating these files was renaming
font/accent_font.xml and font/accent_font_medium.xml to
font/google_sans.xml and font/google_sans_medium.xml, respectively.
At the time of this CL landing, there are not yet any style resources
referencing these new font resources.

The only functional change in this CL is that public Clank builds will
now also preload Google Sans, which is by design to support
https://crbug.com/1110973.

Bug: 1112002
Change-Id: I242e28d1ff57f41d17d08499e9efb236268e11de
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2339612Reviewed-by: default avatarTheresa  <twellington@chromium.org>
Commit-Queue: Natalie Chouinard <chouinard@chromium.org>
Cr-Commit-Position: refs/heads/master@{#796033}
parent ed631911
...@@ -800,6 +800,8 @@ chrome_java_resources = [ ...@@ -800,6 +800,8 @@ chrome_java_resources = [
"java/res/drawable/visa_card.xml", "java/res/drawable/visa_card.xml",
"java/res/drawable/zoom_in.xml", "java/res/drawable/zoom_in.xml",
"java/res/drawable/zoom_out.xml", "java/res/drawable/zoom_out.xml",
"java/res/font/google_sans.xml",
"java/res/font/google_sans_medium.xml",
"java/res/layout-sw360dp/preference_spinner_single_line.xml", "java/res/layout-sw360dp/preference_spinner_single_line.xml",
"java/res/layout-sw600dp/find_toolbar.xml", "java/res/layout-sw600dp/find_toolbar.xml",
"java/res/layout-sw600dp/location_bar.xml", "java/res/layout-sw600dp/location_bar.xml",
...@@ -1071,7 +1073,9 @@ chrome_java_resources = [ ...@@ -1071,7 +1073,9 @@ chrome_java_resources = [
"java/res/values-v21/styles.xml", "java/res/values-v21/styles.xml",
"java/res/values-v24/styles.xml", "java/res/values-v24/styles.xml",
"java/res/values-v25/styles.xml", "java/res/values-v25/styles.xml",
"java/res/values-v26/preloaded_fonts.xml",
"java/res/values-v26/styles.xml", "java/res/values-v26/styles.xml",
"java/res/values-v27/preloaded_fonts.xml",
"java/res/values-v27/styles.xml", "java/res/values-v27/styles.xml",
"java/res/values-v28/styles.xml", "java/res/values-v28/styles.xml",
"java/res/values-xhdpi/dimens.xml", "java/res/values-xhdpi/dimens.xml",
...@@ -1084,6 +1088,7 @@ chrome_java_resources = [ ...@@ -1084,6 +1088,7 @@ chrome_java_resources = [
"java/res/values/ic_launcher_alias.xml", "java/res/values/ic_launcher_alias.xml",
"java/res/values/ic_launcher_round_alias.xml", "java/res/values/ic_launcher_round_alias.xml",
"java/res/values/ids.xml", "java/res/values/ids.xml",
"java/res/values/preloaded_fonts.xml",
"java/res/values/strings.xml", "java/res/values/strings.xml",
"java/res/values/styles.xml", "java/res/values/styles.xml",
"java/res/values/values.xml", "java/res/values/values.xml",
......
...@@ -779,6 +779,7 @@ ...@@ -779,6 +779,7 @@
<meta-data android:name="org.chromium.content.browser.NUM_SANDBOXED_SERVICES" android:value="40"/> <meta-data android:name="org.chromium.content.browser.NUM_SANDBOXED_SERVICES" android:value="40"/>
<meta-data android:name="org.chromium.content.browser.REMOTE_MEDIA_PLAYERS" android:value="org.chromium.chrome.browser.media.remote.DefaultMediaRouteController"/> <meta-data android:name="org.chromium.content.browser.REMOTE_MEDIA_PLAYERS" android:value="org.chromium.chrome.browser.media.remote.DefaultMediaRouteController"/>
<meta-data android:name="org.chromium.content.browser.SMART_CLIP_PROVIDER" android:value="org.chromium.content_public.browser.SmartClipProvider"/> <meta-data android:name="org.chromium.content.browser.SMART_CLIP_PROVIDER" android:value="org.chromium.content_public.browser.SmartClipProvider"/>
<meta-data android:name="preloaded_fonts" android:resource="@array/preloaded_google_sans_fonts"/>
<provider # DIFF-ANCHOR: 2215b9cd <provider # DIFF-ANCHOR: 2215b9cd
android:authorities="$PACKAGE.ChromeBrowserProvider;$PACKAGE.browser;$PACKAGE" android:authorities="$PACKAGE.ChromeBrowserProvider;$PACKAGE.browser;$PACKAGE"
android:exported="true" android:exported="true"
......
...@@ -735,6 +735,7 @@ ...@@ -735,6 +735,7 @@
<meta-data android:name="org.chromium.content.browser.NUM_SANDBOXED_SERVICES" android:value="40"/> <meta-data android:name="org.chromium.content.browser.NUM_SANDBOXED_SERVICES" android:value="40"/>
<meta-data android:name="org.chromium.content.browser.REMOTE_MEDIA_PLAYERS" android:value="org.chromium.chrome.browser.media.remote.DefaultMediaRouteController"/> <meta-data android:name="org.chromium.content.browser.REMOTE_MEDIA_PLAYERS" android:value="org.chromium.chrome.browser.media.remote.DefaultMediaRouteController"/>
<meta-data android:name="org.chromium.content.browser.SMART_CLIP_PROVIDER" android:value="org.chromium.content_public.browser.SmartClipProvider"/> <meta-data android:name="org.chromium.content.browser.SMART_CLIP_PROVIDER" android:value="org.chromium.content_public.browser.SmartClipProvider"/>
<meta-data android:name="preloaded_fonts" android:resource="@array/preloaded_google_sans_fonts"/>
<provider # DIFF-ANCHOR: 2215b9cd <provider # DIFF-ANCHOR: 2215b9cd
android:authorities="$PACKAGE.ChromeBrowserProvider;$PACKAGE.browser;$PACKAGE" android:authorities="$PACKAGE.ChromeBrowserProvider;$PACKAGE.browser;$PACKAGE"
android:exported="true" android:exported="true"
......
...@@ -1178,6 +1178,10 @@ by a child template that "extends" this file. ...@@ -1178,6 +1178,10 @@ by a child template that "extends" this file.
<meta-data android:name="org.chromium.content.browser.REMOTE_MEDIA_PLAYERS" <meta-data android:name="org.chromium.content.browser.REMOTE_MEDIA_PLAYERS"
android:value="org.chromium.chrome.browser.media.remote.DefaultMediaRouteController"/> android:value="org.chromium.chrome.browser.media.remote.DefaultMediaRouteController"/>
<!-- Downloads Google Sans from GMS Core -->
<meta-data android:name="preloaded_fonts"
android:resource="@array/preloaded_google_sans_fonts" />
{% endblock %} {% endblock %}
{% block extra_application_definitions_for_test %} {% block extra_application_definitions_for_test %}
{% endblock %} {% endblock %}
......
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright 2020 The Chromium Authors. All rights reserved.
Use of this source code is governed by a BSD-style license that can be
found in the LICENSE file. -->
<font-family
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
tools:ignore="FontValidationError,FontValidationWarning,UnusedResources"
android:fontProviderAuthority="com.google.android.gms.fonts"
android:fontProviderCerts="@array/com_google_android_gms_fonts_certs"
android:fontProviderPackage="com.google.android.gms"
android:fontProviderQuery="Google Sans"
app:fontProviderAuthority="com.google.android.gms.fonts"
app:fontProviderCerts="@array/com_google_android_gms_fonts_certs"
app:fontProviderPackage="com.google.android.gms"
app:fontProviderQuery="Google Sans" />
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright 2020 The Chromium Authors. All rights reserved.
Use of this source code is governed by a BSD-style license that can be
found in the LICENSE file. -->
<font-family
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
tools:ignore="FontValidationError,FontValidationWarning,UnusedResources"
android:fontProviderAuthority="com.google.android.gms.fonts"
android:fontProviderCerts="@array/com_google_android_gms_fonts_certs"
android:fontProviderPackage="com.google.android.gms"
android:fontProviderQuery="Google Sans:500"
app:fontProviderAuthority="com.google.android.gms.fonts"
app:fontProviderCerts="@array/com_google_android_gms_fonts_certs"
app:fontProviderPackage="com.google.android.gms"
app:fontProviderQuery="Google Sans:500"/>
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright 2020 The Chromium Authors. All rights reserved.
Use of this source code is governed by a BSD-style license that can be
found in the LICENSE file. -->
<resources xmlns:tools="http://schemas.android.com/tools" tools:ignore="UnusedResources">
<!--
Fonts that are specified to be preloaded by AndroidManifest.xml.
Note: we override this resource in API 26 so that we can provide an empty array to preload on
Android O which will crash when preloading fonts because of a platform bug.
b/67327250 or b/111754038
-->
<array name="preloaded_google_sans_fonts"/>
</resources>
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright 2020 The Chromium Authors. All rights reserved.
Use of this source code is governed by a BSD-style license that can be
found in the LICENSE file. -->
<resources xmlns:tools="http://schemas.android.com/tools" tools:ignore="UnusedResources">
<!--
Fonts that are specified to be preloaded by AndroidManifest.xml.
Note: we override this resource in API 26 so that we can provide an empty array to preload on
Android O which will crash when preloading fonts because of a platform bug.
b/67327250 or b/111754038
-->
<array name="preloaded_google_sans_fonts">
<item>@font/google_sans</item>
<item>@font/google_sans_medium</item>
</array>
</resources>
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright 2020 The Chromium Authors. All rights reserved.
Use of this source code is governed by a BSD-style license that can be
found in the LICENSE file. -->
<resources xmlns:tools="http://schemas.android.com/tools" tools:ignore="UnusedResources">
<!--
Fonts that are specified to be preloaded by AndroidManifest.xml.
Note: we override this resource in API 26 so that we can provide an empty array to preload on
Android O which will crash when preloading fonts because of a platform bug.
b/67327250 or b/111754038
-->
<array name="preloaded_google_sans_fonts">
<item>@font/google_sans</item>
<item>@font/google_sans_medium</item>
</array>
</resources>
...@@ -182,6 +182,7 @@ android_resources("ui_java_resources") { ...@@ -182,6 +182,7 @@ android_resources("ui_java_resources") {
"java/res/values/attrs.xml", "java/res/values/attrs.xml",
"java/res/values/color_palette.xml", "java/res/values/color_palette.xml",
"java/res/values/dimens.xml", "java/res/values/dimens.xml",
"java/res/values/font_certs.xml",
"java/res/values/ids.xml", "java/res/values/ids.xml",
"java/res/values/one_off_colors.xml", "java/res/values/one_off_colors.xml",
"java/res/values/semantic_colors_adaptive.xml", "java/res/values/semantic_colors_adaptive.xml",
......
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright 2020 The Chromium Authors. All rights reserved.
Use of this source code is governed by a BSD-style license that can be
found in the LICENSE file. -->
<resources xmlns:tools="http://schemas.android.com/tools" tools:ignore="UnusedResources">
<array name="com_google_android_gms_fonts_certs">
<item>@array/com_google_android_gms_fonts_certs_dev</item>
<item>@array/com_google_android_gms_fonts_certs_prod</item>
</array>
<string-array name="com_google_android_gms_fonts_certs_dev" translatable="false">
<item>
MIIEqDCCA5CgAwIBAgIJANWFuGx90071MA0GCSqGSIb3DQEBBAUAMIGUMQswCQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNTW91bnRhaW4gVmlldzEQMA4GA1UEChMHQW5kcm9pZDEQMA4GA1UECxMHQW5kcm9pZDEQMA4GA1UEAxMHQW5kcm9pZDEiMCAGCSqGSIb3DQEJARYTYW5kcm9pZEBhbmRyb2lkLmNvbTAeFw0wODA0MTUyMzM2NTZaFw0zNTA5MDEyMzM2NTZaMIGUMQswCQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNTW91bnRhaW4gVmlldzEQMA4GA1UEChMHQW5kcm9pZDEQMA4GA1UECxMHQW5kcm9pZDEQMA4GA1UEAxMHQW5kcm9pZDEiMCAGCSqGSIb3DQEJARYTYW5kcm9pZEBhbmRyb2lkLmNvbTCCASAwDQYJKoZIhvcNAQEBBQADggENADCCAQgCggEBANbOLggKv+IxTdGNs8/TGFy0PTP6DHThvbbR24kT9ixcOd9W+EaBPWW+wPPKQmsHxajtWjmQwWfna8mZuSeJS48LIgAZlKkpFeVyxW0qMBujb8X8ETrWy550NaFtI6t9+u7hZeTfHwqNvacKhp1RbE6dBRGWynwMVX8XW8N1+UjFaq6GCJukT4qmpN2afb8sCjUigq0GuMwYXrFVee74bQgLHWGJwPmvmLHC69EH6kWr22ijx4OKXlSIx2xT1AsSHee70w5iDBiK4aph27yH3TxkXy9V89TDdexAcKk/cVHYNnDBapcavl7y0RiQ4biu8ymM8Ga/nmzhRKya6G0cGw8CAQOjgfwwgfkwHQYDVR0OBBYEFI0cxb6VTEM8YYY6FbBMvAPyT+CyMIHJBgNVHSMEgcEwgb6AFI0cxb6VTEM8YYY6FbBMvAPyT+CyoYGapIGXMIGUMQswCQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNTW91bnRhaW4gVmlldzEQMA4GA1UEChMHQW5kcm9pZDEQMA4GA1UECxMHQW5kcm9pZDEQMA4GA1UEAxMHQW5kcm9pZDEiMCAGCSqGSIb3DQEJARYTYW5kcm9pZEBhbmRyb2lkLmNvbYIJANWFuGx90071MAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEEBQADggEBABnTDPEF+3iSP0wNfdIjIz1AlnrPzgAIHVvXxunW7SBrDhEglQZBbKJEk5kT0mtKoOD1JMrSu1xuTKEBahWRbqHsXclaXjoBADb0kkjVEJu/Lh5hgYZnOjvlba8Ld7HCKePCVePoTJBdI4fvugnL8TsgK05aIskyY0hKI9L8KfqfGTl1lzOv2KoWD0KWwtAWPoGChZxmQ+nBli+gwYMzM1vAkP+aayLe0a1EQimlOalO762r0GXO0ks+UeXde2Z4e+8S/pf7pITEI/tP+MxJTALw9QUWEv9lKTk+jkbqxbsh8nfBUapfKqYn0eidpwq2AzVp3juYl7//fKnaPhJD9gs=
</item>
</string-array>
<string-array name="com_google_android_gms_fonts_certs_prod" translatable="false">
<item>
MIIEQzCCAyugAwIBAgIJAMLgh0ZkSjCNMA0GCSqGSIb3DQEBBAUAMHQxCzAJBgNVBAYTAlVTMRMwEQYDVQQIEwpDYWxpZm9ybmlhMRYwFAYDVQQHEw1Nb3VudGFpbiBWaWV3MRQwEgYDVQQKEwtHb29nbGUgSW5jLjEQMA4GA1UECxMHQW5kcm9pZDEQMA4GA1UEAxMHQW5kcm9pZDAeFw0wODA4MjEyMzEzMzRaFw0zNjAxMDcyMzEzMzRaMHQxCzAJBgNVBAYTAlVTMRMwEQYDVQQIEwpDYWxpZm9ybmlhMRYwFAYDVQQHEw1Nb3VudGFpbiBWaWV3MRQwEgYDVQQKEwtHb29nbGUgSW5jLjEQMA4GA1UECxMHQW5kcm9pZDEQMA4GA1UEAxMHQW5kcm9pZDCCASAwDQYJKoZIhvcNAQEBBQADggENADCCAQgCggEBAKtWLgDYO6IIrgqWbxJOKdoR8qtW0I9Y4sypEwPpt1TTcvZApxsdyxMJZ2JORland2qSGT2y5b+3JKkedxiLDmpHpDsz2WCbdxgxRczfey5YZnTJ4VZbH0xqWVW/8lGmPav5xVwnIiJS6HXk+BVKZF+JcWjAsb/GEuq/eFdpuzSqeYTcfi6idkyugwfYwXFU1+5fZKUaRKYCwkkFQVfcAs1fXA5V+++FGfvjJ/CxURaSxaBvGdGDhfXE28LWuT9ozCl5xw4Yq5OGazvV24mZVSoOO0yZ31j7kYvtwYK6NeADwbSxDdJEqO4k//0zOHKrUiGYXtqw/A0LFFtqoZKFjnkCAQOjgdkwgdYwHQYDVR0OBBYEFMd9jMIhF1Ylmn/Tgt9r45jk14alMIGmBgNVHSMEgZ4wgZuAFMd9jMIhF1Ylmn/Tgt9r45jk14aloXikdjB0MQswCQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNTW91bnRhaW4gVmlldzEUMBIGA1UEChMLR29vZ2xlIEluYy4xEDAOBgNVBAsTB0FuZHJvaWQxEDAOBgNVBAMTB0FuZHJvaWSCCQDC4IdGZEowjTAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBAUAA4IBAQBt0lLO74UwLDYKqs6Tm8/yzKkEu116FmH4rkaymUIE0P9KaMftGlMexFlaYjzmB2OxZyl6euNXEsQH8gjwyxCUKRJNexBiGcCEyj6z+a1fuHHvkiaai+KL8W1EyNmgjmyy8AW7P+LLlkR+ho5zEHatRbM/YAnqGcFh5iZBqpknHf1SKMXFh4dd239FJ1jWYfbMDMy3NS5CTMQ2XFI1MvcyUTdZPErjQfTbQe3aDQsQcafEQPD+nqActifKZ0Np0IS9L9kR/wbNvyz6ENwPiTrjV2KRkEjH78ZMcUQXg0L3BYHJ3lc69Vs5Ddf9uUGGMYldX3WfMBEmh/9iFBDAaTCK
</item>
</string-array>
</resources>
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment