diff options
| author | Victoria Lease <violets@google.com> | 2012-04-26 11:18:40 -0700 |
|---|---|---|
| committer | Victoria Lease <violets@google.com> | 2012-05-07 11:50:13 -0700 |
| commit | bd1844d272afd7416a37765b90ecd843c0b99c9f (patch) | |
| tree | 6e549550df6879ed517d62f3e9c32bb1cface0ce | |
| parent | ee00b31a54cc186cb53fe30d7834361791baab20 (diff) | |
| download | frameworks_base-bd1844d272afd7416a37765b90ecd843c0b99c9f.zip frameworks_base-bd1844d272afd7416a37765b90ecd843c0b99c9f.tar.gz frameworks_base-bd1844d272afd7416a37765b90ecd843c0b99c9f.tar.bz2 | |
Add Droid Devanagari/Tamil fonts.
These fonts are replacements for the Lohit Devanagari/Tamil fonts.
We need to fit Devanagari onto all builds, so we only provide a single,
regular-weight font there, but Tamil is omitted for SMALLER_FONT_FOOTPRINT
builds and gets UI/non-UI and Regular/Bold weight versions. The UI versions
of the fonts are used for UI/system display, and the non-UI versions are
used only by WebView.
Bug: 6318791
Change-Id: I50ff6ec4bb428c0ac30049273f03a94de05b0c4f
| -rw-r--r-- | data/fonts/Android.mk | 19 | ||||
| -rw-r--r-- | data/fonts/DroidSansDevanagari-Regular.ttf | bin | 0 -> 123804 bytes | |||
| -rw-r--r-- | data/fonts/DroidSansTamil-Bold.ttf | bin | 0 -> 36448 bytes | |||
| -rw-r--r-- | data/fonts/DroidSansTamil-Regular.ttf | bin | 0 -> 36308 bytes | |||
| -rw-r--r-- | data/fonts/fallback_fonts-ja.xml | 5 | ||||
| -rw-r--r-- | data/fonts/fallback_fonts.xml | 5 | ||||
| -rw-r--r-- | data/fonts/fonts.mk | 1 |
7 files changed, 26 insertions, 4 deletions
diff --git a/data/fonts/Android.mk b/data/fonts/Android.mk index 8ad15b6..13f2480 100644 --- a/data/fonts/Android.mk +++ b/data/fonts/Android.mk @@ -65,6 +65,22 @@ LOCAL_MODULE_PATH := $(TARGET_OUT)/fonts include $(BUILD_PREBUILT) include $(CLEAR_VARS) +LOCAL_MODULE := DroidSansTamil-Regular.ttf +LOCAL_SRC_FILES := $(LOCAL_MODULE) +LOCAL_MODULE_CLASS := ETC +LOCAL_MODULE_TAGS := optional +LOCAL_MODULE_PATH := $(TARGET_OUT)/fonts +include $(BUILD_PREBUILT) + +include $(CLEAR_VARS) +LOCAL_MODULE := DroidSansTamil-Bold.ttf +LOCAL_SRC_FILES := $(LOCAL_MODULE) +LOCAL_MODULE_CLASS := ETC +LOCAL_MODULE_TAGS := optional +LOCAL_MODULE_PATH := $(TARGET_OUT)/fonts +include $(BUILD_PREBUILT) + +include $(CLEAR_VARS) LOCAL_MODULE := MTLmr3m.ttf LOCAL_SRC_FILES := $(LOCAL_MODULE) LOCAL_MODULE_CLASS := ETC @@ -85,6 +101,8 @@ extra_font_files := \ DroidSans.ttf \ DroidSans-Bold.ttf \ DroidSansEthiopic-Regular.ttf \ + DroidSansTamil-Regular.ttf \ + DroidSansTamil-Bold.ttf \ MTLmr3m.ttf \ fallback_fonts-ja.xml endif # SMALLER_FONT_FOOTPRINT @@ -126,6 +144,7 @@ font_src_files := \ Roboto-BoldItalic.ttf \ DroidNaskh-Regular.ttf \ DroidNaskh-Regular-SystemUI.ttf \ + DroidSansDevanagari-Regular.ttf \ DroidSansHebrew-Regular.ttf \ DroidSansHebrew-Bold.ttf \ DroidSansThai.ttf \ diff --git a/data/fonts/DroidSansDevanagari-Regular.ttf b/data/fonts/DroidSansDevanagari-Regular.ttf Binary files differnew file mode 100644 index 0000000..45e15e6 --- /dev/null +++ b/data/fonts/DroidSansDevanagari-Regular.ttf diff --git a/data/fonts/DroidSansTamil-Bold.ttf b/data/fonts/DroidSansTamil-Bold.ttf Binary files differnew file mode 100644 index 0000000..8ad0085 --- /dev/null +++ b/data/fonts/DroidSansTamil-Bold.ttf diff --git a/data/fonts/DroidSansTamil-Regular.ttf b/data/fonts/DroidSansTamil-Regular.ttf Binary files differnew file mode 100644 index 0000000..4b8f536 --- /dev/null +++ b/data/fonts/DroidSansTamil-Regular.ttf diff --git a/data/fonts/fallback_fonts-ja.xml b/data/fonts/fallback_fonts-ja.xml index a182e31..be53d1d 100644 --- a/data/fonts/fallback_fonts-ja.xml +++ b/data/fonts/fallback_fonts-ja.xml @@ -65,7 +65,7 @@ </family> <family> <fileset> - <file>Lohit-Devanagari.ttf</file> + <file>DroidSansDevanagari-Regular.ttf</file> </fileset> </family> <family> @@ -75,7 +75,8 @@ </family> <family> <fileset> - <file>Lohit-Tamil.ttf</file> + <file>DroidSansTamil-Regular.ttf</file> + <file>DroidSansTamil-Bold.ttf</file> </fileset> </family> <family> diff --git a/data/fonts/fallback_fonts.xml b/data/fonts/fallback_fonts.xml index 69d223e..80fffa9 100644 --- a/data/fonts/fallback_fonts.xml +++ b/data/fonts/fallback_fonts.xml @@ -65,7 +65,7 @@ </family> <family> <fileset> - <file>Lohit-Devanagari.ttf</file> + <file>DroidSansDevanagari-Regular.ttf</file> </fileset> </family> <family> @@ -75,7 +75,8 @@ </family> <family> <fileset> - <file>Lohit-Tamil.ttf</file> + <file>DroidSansTamil-Regular.ttf</file> + <file>DroidSansTamil-Bold.ttf</file> </fileset> </family> <family> diff --git a/data/fonts/fonts.mk b/data/fonts/fonts.mk index 0eec616..7a84df6 100644 --- a/data/fonts/fonts.mk +++ b/data/fonts/fonts.mk @@ -26,6 +26,7 @@ PRODUCT_PACKAGES := \ Roboto-BoldItalic.ttf \ DroidNaskh-Regular.ttf \ DroidNaskh-Regular-SystemUI.ttf \ + DroidSansDevanagari-Regular.ttf \ DroidSansHebrew-Regular.ttf \ DroidSansHebrew-Bold.ttf \ DroidSansThai.ttf \ |