summaryrefslogtreecommitdiffstats
path: root/data/fonts
diff options
context:
space:
mode:
authorVictoria Lease <violets@google.com>2013-09-06 14:04:18 -0700
committerVictoria Lease <violets@google.com>2013-09-11 09:52:29 -0700
commit36d4cc8d2b308fd9a0894e6ce160aea2079c1aef (patch)
treeb078c4b99efc9ec0b632fbde5ecb3f988d248cc4 /data/fonts
parentec7a6ea84578be91e04a54331ea4ca63e7fb69e1 (diff)
downloadframeworks_base-36d4cc8d2b308fd9a0894e6ce160aea2079c1aef.zip
frameworks_base-36d4cc8d2b308fd9a0894e6ce160aea2079c1aef.tar.gz
frameworks_base-36d4cc8d2b308fd9a0894e6ce160aea2079c1aef.tar.bz2
include Padauk in fallback chain
Bug: 10625246 Change-Id: I32530a992beeafe2ee16da36f0dc0a752c647cc6 (cherry picked from commit 5d34e4d679e6237b0d075177d1e365161c684445) Conflicts: data/fonts/fallback_fonts.xml
Diffstat (limited to 'data/fonts')
-rw-r--r--data/fonts/fallback_fonts.xml6
1 files changed, 6 insertions, 0 deletions
diff --git a/data/fonts/fallback_fonts.xml b/data/fonts/fallback_fonts.xml
index d9170c9..1198aba 100644
--- a/data/fonts/fallback_fonts.xml
+++ b/data/fonts/fallback_fonts.xml
@@ -175,6 +175,12 @@
</family>
<family>
<fileset>
+ <file>Padauk-book.ttf</file>
+ <file>Padauk-bookbold.ttf</file>
+ </fileset>
+ </family>
+ <family>
+ <fileset>
<file>NotoSansSymbols-Regular.ttf</file>
</fileset>
</family>