summaryrefslogtreecommitdiffstats
path: root/data/fonts/fonts.mk
diff options
context:
space:
mode:
authorChet Haase <chet@google.com>2011-07-06 11:17:26 -0700
committerChet Haase <chet@google.com>2011-07-15 12:06:35 -0700
commitc8f060c93854883d5d7a825b11b18c7f4e76e2b0 (patch)
tree8fd2e9ce1667660cc8f22b532e7cb69752e7c64c /data/fonts/fonts.mk
parent649a1418d96e80ed384e7e30732d4e2aa5928585 (diff)
downloadframeworks_base-c8f060c93854883d5d7a825b11b18c7f4e76e2b0.zip
frameworks_base-c8f060c93854883d5d7a825b11b18c7f4e76e2b0.tar.gz
frameworks_base-c8f060c93854883d5d7a825b11b18c7f4e76e2b0.tar.bz2
Read font info from system config files
This change adds new files in /system/etc: system_fonts.xml and fallback_fonts.xml. The change also allows a third file to be added by vendors in /vendor/etc/fallback_fonts.xml. These files, loaded at boot time, mimic the logic that used to be in code, but which is now configurable through editing these files, making the system more flexible and easy to work with for us and vendors as future fonts are added to the system. Change-Id: I209f1ef08a5279b376b89a880241906387efd576
Diffstat (limited to 'data/fonts/fonts.mk')
-rw-r--r--data/fonts/fonts.mk4
1 files changed, 3 insertions, 1 deletions
diff --git a/data/fonts/fonts.mk b/data/fonts/fonts.mk
index d222c0b..57a1bab 100644
--- a/data/fonts/fonts.mk
+++ b/data/fonts/fonts.mk
@@ -30,4 +30,6 @@ PRODUCT_COPY_FILES := \
frameworks/base/data/fonts/DroidSansFallback.ttf:system/fonts/DroidSansFallback.ttf \
frameworks/base/data/fonts/AndroidClock.ttf:system/fonts/AndroidClock.ttf \
frameworks/base/data/fonts/AndroidClock_Highlight.ttf:system/fonts/AndroidClock_Highlight.ttf \
- frameworks/base/data/fonts/AndroidClock_Solid.ttf:system/fonts/AndroidClock_Solid.ttf
+ frameworks/base/data/fonts/AndroidClock_Solid.ttf:system/fonts/AndroidClock_Solid.ttf \
+ frameworks/base/data/fonts/system_fonts.xml:system/etc/system_fonts.xml \
+ frameworks/base/data/fonts/fallback_fonts.xml:system/etc/fallback_fonts.xml