Commit f529b0df authored by Natalie Chouinard's avatar Natalie Chouinard Committed by Commit Bot

[GoogleSans] Remove unnecessary font workaround

This resource override on API 26 does not appear to be necessary
anymore. Tested on Android O emulator. More background on b/67327250.

Bug: 1129668
Change-Id: I234e42b580f95bcc430353cfec29243c3f69b819
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2417536Reviewed-by: default avatarTheresa  <twellington@chromium.org>
Commit-Queue: Natalie Chouinard <chouinard@chromium.org>
Cr-Commit-Position: refs/heads/master@{#808448}
parent bd3ed862
...@@ -1027,9 +1027,7 @@ chrome_java_resources = [ ...@@ -1027,9 +1027,7 @@ 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",
......
<?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>
...@@ -4,13 +4,7 @@ ...@@ -4,13 +4,7 @@
found in the LICENSE file. --> found in the LICENSE file. -->
<resources xmlns:tools="http://schemas.android.com/tools" tools:ignore="UnusedResources"> <resources xmlns:tools="http://schemas.android.com/tools" tools:ignore="UnusedResources">
<!-- <!-- Fonts that are specified to be preloaded by AndroidManifest.xml. -->
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"> <array name="preloaded_google_sans_fonts">
<item>@font/google_sans</item> <item>@font/google_sans</item>
<item>@font/google_sans_medium</item> <item>@font/google_sans_medium</item>
......
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