summaryrefslogtreecommitdiffstats
path: root/data
diff options
context:
space:
mode:
authorXavier Ducrohet <xav@android.com>2009-11-08 15:15:01 -0800
committerXavier Ducrohet <xav@android.com>2009-11-09 14:55:08 -0800
commit9a4593ffcce99e9f7b89b165911c2a870c27cc45 (patch)
tree36b4e3b3c613fc4e2e30f980049a879b444ae4b6 /data
parent3f857b78fc68e5d700139bdc6078c5333b62a9bc (diff)
downloadframeworks_base-9a4593ffcce99e9f7b89b165911c2a870c27cc45.zip
frameworks_base-9a4593ffcce99e9f7b89b165911c2a870c27cc45.tar.gz
frameworks_base-9a4593ffcce99e9f7b89b165911c2a870c27cc45.tar.bz2
Support for fallback fonts in layoutlib.
BUG 2041229 Change-Id: Ib12bcb7f6d8f0e4c2b51871f8129ecf51fa938ee
Diffstat (limited to 'data')
-rw-r--r--data/fonts/fonts.xml7
1 files changed, 6 insertions, 1 deletions
diff --git a/data/fonts/fonts.xml b/data/fonts/fonts.xml
index 2bce846..6bcaaaf 100644
--- a/data/fonts/fonts.xml
+++ b/data/fonts/fonts.xml
@@ -13,6 +13,10 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
+<!--
+ This is only used by the layoutlib to display
+ layouts in ADT.
+-->
<fonts>
<font ttf="DroidSans">
<name>sans-serif</name>
@@ -39,5 +43,6 @@
<name>courier new</name>
<name>monaco</name>
</font>
- <font ttf="DroidSansFallback" />
+ <fallback ttf="DroidSansFallback" />
+ <fallback ttf="DroidSansJapanese" />
</fonts> \ No newline at end of file