diff options
| author | 2023-08-14 22:31:55 +0000 | |
|---|---|---|
| committer | 2023-08-14 22:31:55 +0000 | |
| commit | aa1fbff6e107d47c6f6dd74b90a4ace0238f3b1c (patch) | |
| tree | f9cb7adcfe009211f596513dca924e7ea2ed7eab /graphics/java/android | |
| parent | 39dc31d996dd53566c98b9cc0393e604cd76b88d (diff) | |
| parent | 81808d8d02c93ea44eb5ccc21d3871368d194ee6 (diff) | |
Merge "Deprecate fonts.xml and add hidden font_fallback.xml" into main am: a6fac5d6c7 am: 38d368a926 am: f6aa44a3c4 am: 81808d8d02
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2670877
Change-Id: I3146b6daa14dbfddba59096851ac148ec20b23a9
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 8fe28ae731b8..acc4da6e1527 100644 --- a/graphics/java/android/graphics/fonts/SystemFonts.java +++ b/graphics/java/android/graphics/fonts/SystemFonts.java @@ -47,7 +47,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"; @@ -220,6 +220,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. |