diff options
| author | Android (Google) Code Review <android-gerrit@google.com> | 2009-11-09 16:52:54 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2009-11-09 16:52:54 -0800 |
| commit | e6ab011b8b8aa6c461e64cabb9b25d890d68edb1 (patch) | |
| tree | 1a825f525c23001aeba42af680e6e4f0406f6dd1 /data | |
| parent | 3ea2ae7d6f8a73947831c15f970de70730c5a0f6 (diff) | |
| parent | 9a4593ffcce99e9f7b89b165911c2a870c27cc45 (diff) | |
| download | frameworks_base-e6ab011b8b8aa6c461e64cabb9b25d890d68edb1.zip frameworks_base-e6ab011b8b8aa6c461e64cabb9b25d890d68edb1.tar.gz frameworks_base-e6ab011b8b8aa6c461e64cabb9b25d890d68edb1.tar.bz2 | |
Merge change Ib12bcb7f into eclair
* changes:
Support for fallback fonts in layoutlib.
Diffstat (limited to 'data')
| -rw-r--r-- | data/fonts/fonts.xml | 7 |
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 |