75 lines
4.1 KiB
Diff
75 lines
4.1 KiB
Diff
|
From: uazo <uazo@users.noreply.github.com>
|
||
|
|
Date: Wed, 6 Jul 2022 09:37:25 +0000
|
||
|
|
Subject: Remove preload of com.google.android.gms.fonts
|
||
|
|
|
||
|
|
Original License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
|
||
|
|
License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
|
||
|
|
|
||
|
|
Change-Id: I284d0b6feb976bb058b5406691622d1215320c63
|
||
|
|
---
|
||
|
|
chrome/android/java/res_base/font/chrome_google_sans.xml | 8 +-------
|
||
|
|
.../java/res_base/font/chrome_google_sans_bold.xml | 8 +-------
|
||
|
|
.../java/res_base/font/chrome_google_sans_medium.xml | 8 +-------
|
||
|
|
.../org/chromium/chrome/browser/fonts/FontPreloader.java | 1 +
|
||
|
|
4 files changed, 4 insertions(+), 21 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/chrome/android/java/res_base/font/chrome_google_sans.xml b/chrome/android/java/res_base/font/chrome_google_sans.xml
|
||
|
|
--- a/chrome/android/java/res_base/font/chrome_google_sans.xml
|
||
|
|
+++ b/chrome/android/java/res_base/font/chrome_google_sans.xml
|
||
|
|
@@ -8,10 +8,4 @@ found in the LICENSE file.
|
||
|
|
<font-family
|
||
|
|
xmlns:app="http://schemas.android.com/apk/res-auto"
|
||
|
|
xmlns:tools="http://schemas.android.com/tools"
|
||
|
|
- tools:ignore="FontValidationError,FontValidationWarning,UnusedResources"
|
||
|
|
- app:fontProviderAuthority="com.google.android.gms.fonts"
|
||
|
|
- app:fontProviderCerts="@array/ui_com_google_android_gms_fonts_certs"
|
||
|
|
- app:fontProviderFetchStrategy="async"
|
||
|
|
- app:fontProviderPackage="com.google.android.gms"
|
||
|
|
- app:fontProviderQuery="Google Sans"
|
||
|
|
- app:fontProviderSystemFontFamily="google-sans"/>
|
||
|
|
+ tools:ignore="FontValidationError,FontValidationWarning,UnusedResources"/>
|
||
|
|
diff --git a/chrome/android/java/res_base/font/chrome_google_sans_bold.xml b/chrome/android/java/res_base/font/chrome_google_sans_bold.xml
|
||
|
|
--- a/chrome/android/java/res_base/font/chrome_google_sans_bold.xml
|
||
|
|
+++ b/chrome/android/java/res_base/font/chrome_google_sans_bold.xml
|
||
|
|
@@ -8,10 +8,4 @@ found in the LICENSE file.
|
||
|
|
<font-family
|
||
|
|
xmlns:app="http://schemas.android.com/apk/res-auto"
|
||
|
|
xmlns:tools="http://schemas.android.com/tools"
|
||
|
|
- tools:ignore="FontValidationError,FontValidationWarning,UnusedResources"
|
||
|
|
- app:fontProviderAuthority="com.google.android.gms.fonts"
|
||
|
|
- app:fontProviderCerts="@array/ui_com_google_android_gms_fonts_certs"
|
||
|
|
- app:fontProviderFetchStrategy="async"
|
||
|
|
- app:fontProviderPackage="com.google.android.gms"
|
||
|
|
- app:fontProviderQuery="Google Sans:700"
|
||
|
|
- app:fontProviderSystemFontFamily="google-sans-bold"/>
|
||
|
|
+ tools:ignore="FontValidationError,FontValidationWarning,UnusedResources"/>
|
||
|
|
diff --git a/chrome/android/java/res_base/font/chrome_google_sans_medium.xml b/chrome/android/java/res_base/font/chrome_google_sans_medium.xml
|
||
|
|
--- a/chrome/android/java/res_base/font/chrome_google_sans_medium.xml
|
||
|
|
+++ b/chrome/android/java/res_base/font/chrome_google_sans_medium.xml
|
||
|
|
@@ -8,10 +8,4 @@ found in the LICENSE file.
|
||
|
|
<font-family
|
||
|
|
xmlns:app="http://schemas.android.com/apk/res-auto"
|
||
|
|
xmlns:tools="http://schemas.android.com/tools"
|
||
|
|
- tools:ignore="FontValidationError,FontValidationWarning,UnusedResources"
|
||
|
|
- app:fontProviderAuthority="com.google.android.gms.fonts"
|
||
|
|
- app:fontProviderCerts="@array/ui_com_google_android_gms_fonts_certs"
|
||
|
|
- app:fontProviderFetchStrategy="async"
|
||
|
|
- app:fontProviderPackage="com.google.android.gms"
|
||
|
|
- app:fontProviderQuery="Google Sans:500"
|
||
|
|
- app:fontProviderSystemFontFamily="google-sans-medium"/>
|
||
|
|
+ tools:ignore="FontValidationError,FontValidationWarning,UnusedResources"/>
|
||
|
|
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/fonts/FontPreloader.java b/chrome/android/java/src/org/chromium/chrome/browser/fonts/FontPreloader.java
|
||
|
|
--- a/chrome/android/java/src/org/chromium/chrome/browser/fonts/FontPreloader.java
|
||
|
|
+++ b/chrome/android/java/src/org/chromium/chrome/browser/fonts/FontPreloader.java
|
||
|
|
@@ -84,6 +84,7 @@ public class FontPreloader {
|
||
|
|
mThreadChecker.assertOnValidThread();
|
||
|
|
if (!mInitialized) {
|
||
|
|
mInitialized = true;
|
||
|
|
+ if ((true)) return;
|
||
|
|
context = context.getApplicationContext();
|
||
|
|
OnFontCallback callback = new OnFontCallback();
|
||
|
|
for (int font : mFonts) {
|
||
|
|
--
|
||
|
|
2.40.1
|
||
|
|
|