diff options
| author | 2023-08-14 08:35:13 +0000 | |
|---|---|---|
| committer | 2023-08-14 08:35:13 +0000 | |
| commit | 38d368a926baf474b8737aa0364074ec2cb8cc08 (patch) | |
| tree | 38a85f63ed1b0b393959261eebacf80c160889d6 /graphics/java/android | |
| parent | 0219efd6b9f6581e54c454d19d179a95c36d493e (diff) | |
| parent | a6fac5d6c7c5ad05094c315812cc53a07729d82c (diff) | |
Merge "Deprecate fonts.xml and add hidden font_fallback.xml" into main am: a6fac5d6c7
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2670877
Change-Id: I72c3f5d32e45b58c8e4c9689af5c8dbbeed1f76b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'graphics/java/android')
| -rw-r--r-- | graphics/java/android/graphics/fonts/SystemFonts.java | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/graphics/java/android/graphics/fonts/SystemFonts.java b/graphics/java/android/graphics/fonts/SystemFonts.java index 6278c0e23f27..1c1723cbd195 100644 --- a/graphics/java/android/graphics/fonts/SystemFonts.java +++ b/graphics/java/android/graphics/fonts/SystemFonts.java @@ -46,7 +46,7 @@ import java.util.Set; public final class SystemFonts { private static final String TAG = "SystemFonts"; - private static final String FONTS_XML = "/system/etc/fonts.xml"; + private static final String FONTS_XML = "/system/etc/font_fallback.xml"; /** @hide */ public static final String SYSTEM_FONT_DIR = "/system/fonts/"; private static final String OEM_XML = "/product/etc/fonts_customization.xml"; @@ -208,6 +208,19 @@ public final class SystemFonts { } /** + * Get the updated FontConfig for testing purposes. + * @hide + */ + public static @NonNull FontConfig getSystemFontConfigForTesting( + @NonNull String fontsXmlPath, + @Nullable Map<String, File> updatableFontMap, + long lastModifiedDate, + int configVersion) { + return getSystemFontConfigInternal(fontsXmlPath, SYSTEM_FONT_DIR, OEM_XML, OEM_FONT_DIR, + updatableFontMap, lastModifiedDate, configVersion); + } + + /** * Get the updated FontConfig. * * @param updatableFontMap a font mapping of updated font files. |