diff options
| author | The Android Open Source Project <initial-contribution@android.com> | 2008-12-17 18:05:43 -0800 |
|---|---|---|
| committer | The Android Open Source Project <initial-contribution@android.com> | 2008-12-17 18:05:43 -0800 |
| commit | f013e1afd1e68af5e3b868c26a653bbfb39538f8 (patch) | |
| tree | 7ad6c8fd9c7b55f4b4017171dec1cb760bbd26bf /data/fonts | |
| parent | e70cfafe580c6f2994c4827cd8a534aabf3eb05c (diff) | |
| download | frameworks_base-f013e1afd1e68af5e3b868c26a653bbfb39538f8.zip frameworks_base-f013e1afd1e68af5e3b868c26a653bbfb39538f8.tar.gz frameworks_base-f013e1afd1e68af5e3b868c26a653bbfb39538f8.tar.bz2 | |
Code drop from //branches/cupcake/...@124589
Diffstat (limited to 'data/fonts')
| -rw-r--r-- | data/fonts/Android.mk | 7 | ||||
| -rw-r--r-- | data/fonts/DroidSans-Bold.ttf | bin | 150804 -> 191032 bytes | |||
| -rw-r--r-- | data/fonts/DroidSans.ttf | bin | 149076 -> 190044 bytes | |||
| -rwxr-xr-x | data/fonts/DroidSansFallback.ttf | bin | 3022632 -> 3081908 bytes | |||
| -rw-r--r-- | data/fonts/DroidSansMono.ttf | bin | 78296 -> 117072 bytes | |||
| -rw-r--r-- | data/fonts/DroidSerif-Bold.ttf | bin | 172012 -> 184836 bytes | |||
| -rw-r--r-- | data/fonts/DroidSerif-BoldItalic.ttf | bin | 137212 -> 189916 bytes | |||
| -rw-r--r-- | data/fonts/DroidSerif-Italic.ttf | bin | 155220 -> 177176 bytes | |||
| -rw-r--r-- | data/fonts/DroidSerif-Regular.ttf | bin | 162864 -> 172532 bytes |
9 files changed, 5 insertions, 2 deletions
diff --git a/data/fonts/Android.mk b/data/fonts/Android.mk index 299cdd4..a8abf8b 100644 --- a/data/fonts/Android.mk +++ b/data/fonts/Android.mk @@ -22,8 +22,11 @@ copy_from := \ DroidSerif-Bold.ttf \ DroidSerif-Italic.ttf \ DroidSerif-BoldItalic.ttf \ - DroidSansMono.ttf \ - DroidSansFallback.ttf + DroidSansMono.ttf + +ifneq ($(NO_FALLBACK_FONT),true) + copy_from += DroidSansFallback.ttf +endif copy_to := $(addprefix $(TARGET_OUT)/fonts/,$(copy_from)) diff --git a/data/fonts/DroidSans-Bold.ttf b/data/fonts/DroidSans-Bold.ttf Binary files differindex fc60df4..7ac04b6 100644 --- a/data/fonts/DroidSans-Bold.ttf +++ b/data/fonts/DroidSans-Bold.ttf diff --git a/data/fonts/DroidSans.ttf b/data/fonts/DroidSans.ttf Binary files differindex 458ba59..2537cc3 100644 --- a/data/fonts/DroidSans.ttf +++ b/data/fonts/DroidSans.ttf diff --git a/data/fonts/DroidSansFallback.ttf b/data/fonts/DroidSansFallback.ttf Binary files differindex 38b5b1a..61460b1 100755 --- a/data/fonts/DroidSansFallback.ttf +++ b/data/fonts/DroidSansFallback.ttf diff --git a/data/fonts/DroidSansMono.ttf b/data/fonts/DroidSansMono.ttf Binary files differindex 4546611..6e79dad 100644 --- a/data/fonts/DroidSansMono.ttf +++ b/data/fonts/DroidSansMono.ttf diff --git a/data/fonts/DroidSerif-Bold.ttf b/data/fonts/DroidSerif-Bold.ttf Binary files differindex b6add0e..85d6c6b 100644 --- a/data/fonts/DroidSerif-Bold.ttf +++ b/data/fonts/DroidSerif-Bold.ttf diff --git a/data/fonts/DroidSerif-BoldItalic.ttf b/data/fonts/DroidSerif-BoldItalic.ttf Binary files differindex 921434f..9d8e798 100644 --- a/data/fonts/DroidSerif-BoldItalic.ttf +++ b/data/fonts/DroidSerif-BoldItalic.ttf diff --git a/data/fonts/DroidSerif-Italic.ttf b/data/fonts/DroidSerif-Italic.ttf Binary files differindex 1ef1f75..6acc86d 100644 --- a/data/fonts/DroidSerif-Italic.ttf +++ b/data/fonts/DroidSerif-Italic.ttf diff --git a/data/fonts/DroidSerif-Regular.ttf b/data/fonts/DroidSerif-Regular.ttf Binary files differindex 239ba38..8c1c2c4 100644 --- a/data/fonts/DroidSerif-Regular.ttf +++ b/data/fonts/DroidSerif-Regular.ttf |