diff options
| author | Xavier Ducrohet <xav@android.com> | 2011-10-04 18:01:07 -0700 |
|---|---|---|
| committer | Xavier Ducrohet <xav@android.com> | 2011-10-04 18:02:10 -0700 |
| commit | 178006a0e05b41b4c4de93aec30368a9102ca140 (patch) | |
| tree | 5261679b7d2ae70313d6896a54b6301c69a13179 /data/fonts | |
| parent | 3c1951c442e40f7f46775acfc8a22c24f04d8cfc (diff) | |
| download | frameworks_base-178006a0e05b41b4c4de93aec30368a9102ca140.zip frameworks_base-178006a0e05b41b4c4de93aec30368a9102ca140.tar.gz frameworks_base-178006a0e05b41b4c4de93aec30368a9102ca140.tar.bz2 | |
Layoutlib now parses system_fonts.xml instead of its own.
Also parse fallback_fonts.
This lets layoutlib automatically use the same fonts as the base
platforms, for instance it now uses the new ICS fonts.
Change-Id: Id6e778dc0e3f2a9112601e0eaf8499a9713ec433
Diffstat (limited to 'data/fonts')
| -rw-r--r-- | data/fonts/fonts.xml | 48 |
1 files changed, 0 insertions, 48 deletions
diff --git a/data/fonts/fonts.xml b/data/fonts/fonts.xml deleted file mode 100644 index 1fd7bba..0000000 --- a/data/fonts/fonts.xml +++ /dev/null @@ -1,48 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2008 The Android Open Source Project - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - 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> - <name>arial</name> - <name>helvetica</name> - <name>tahoma</name> - <name>verdana</name> - </font> - <font ttf="DroidSerif"> - <name>serif</name> - <name>times</name> - <name>times new roman</name> - <name>palatino</name> - <name>georgia</name> - <name>baskerville</name> - <name>goudy</name> - <name>fantasy</name> - <name>cursive</name> - <name>ITC Stone Serif</name> - </font> - <font ttf="DroidSansMono"> - <name>monospace</name> - <name>courier</name> - <name>courier new</name> - <name>monaco</name> - </font> - <fallback ttf="DroidSansFallback" /> - <fallback ttf="MTLmr3m" /> -</fonts> |