diff options
| author | Victoria Lease <violets@google.com> | 2013-09-05 21:15:00 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-09-05 21:15:01 +0000 |
| commit | e0e4197c55a8a7f6896eec2794c4cd455736e46b (patch) | |
| tree | cf9565c948af998181e24312e716e4b4ad9a6a19 /data/fonts | |
| parent | dfafaffe8601a3483e8da8f32bd4c754fecb88c1 (diff) | |
| parent | 531dfc45735eb0f1c5a452747b9261a0a6d2f182 (diff) | |
| download | frameworks_base-e0e4197c55a8a7f6896eec2794c4cd455736e46b.zip frameworks_base-e0e4197c55a8a7f6896eec2794c4cd455736e46b.tar.gz frameworks_base-e0e4197c55a8a7f6896eec2794c4cd455736e46b.tar.bz2 | |
Merge "DroidSans -> NotoSans for {Devanagari,Tamil,Thai}" into klp-dev
Diffstat (limited to 'data/fonts')
| -rw-r--r-- | data/fonts/Android.mk | 20 | ||||
| -rw-r--r-- | data/fonts/DroidSansDevanagari-Regular.ttf | bin | 123372 -> 0 bytes | |||
| -rw-r--r-- | data/fonts/DroidSansTamil-Bold.ttf | bin | 36448 -> 0 bytes | |||
| -rw-r--r-- | data/fonts/DroidSansTamil-Regular.ttf | bin | 36308 -> 0 bytes | |||
| -rw-r--r-- | data/fonts/DroidSansThai.ttf | bin | 35480 -> 0 bytes | |||
| -rw-r--r-- | data/fonts/fallback_fonts.xml | 28 | ||||
| -rw-r--r-- | data/fonts/fonts.mk | 2 |
7 files changed, 24 insertions, 26 deletions
diff --git a/data/fonts/Android.mk b/data/fonts/Android.mk index 7f8d5f0..0d9a386 100644 --- a/data/fonts/Android.mk +++ b/data/fonts/Android.mk @@ -53,22 +53,6 @@ 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 @@ -81,8 +65,6 @@ extra_font_files := \ DroidSans.ttf \ DroidSans-Bold.ttf \ DroidSansEthiopic-Regular.ttf \ - DroidSansTamil-Regular.ttf \ - DroidSansTamil-Bold.ttf \ MTLmr3m.ttf endif # SMALLER_FONT_FOOTPRINT @@ -153,10 +135,8 @@ font_src_files += \ RobotoCondensed-BoldItalic.ttf \ DroidNaskh-Regular.ttf \ DroidNaskhUI-Regular.ttf \ - DroidSansDevanagari-Regular.ttf \ DroidSansHebrew-Regular.ttf \ DroidSansHebrew-Bold.ttf \ - DroidSansThai.ttf \ DroidSansArmenian.ttf \ DroidSansGeorgian.ttf \ AndroidEmoji.ttf diff --git a/data/fonts/DroidSansDevanagari-Regular.ttf b/data/fonts/DroidSansDevanagari-Regular.ttf Binary files differdeleted file mode 100644 index a25e0e3..0000000 --- a/data/fonts/DroidSansDevanagari-Regular.ttf +++ /dev/null diff --git a/data/fonts/DroidSansTamil-Bold.ttf b/data/fonts/DroidSansTamil-Bold.ttf Binary files differdeleted file mode 100644 index 8ad0085..0000000 --- a/data/fonts/DroidSansTamil-Bold.ttf +++ /dev/null diff --git a/data/fonts/DroidSansTamil-Regular.ttf b/data/fonts/DroidSansTamil-Regular.ttf Binary files differdeleted file mode 100644 index 4b8f536..0000000 --- a/data/fonts/DroidSansTamil-Regular.ttf +++ /dev/null diff --git a/data/fonts/DroidSansThai.ttf b/data/fonts/DroidSansThai.ttf Binary files differdeleted file mode 100644 index 15b00c2..0000000 --- a/data/fonts/DroidSansThai.ttf +++ /dev/null diff --git a/data/fonts/fallback_fonts.xml b/data/fonts/fallback_fonts.xml index d11a3c7..d7b1464 100644 --- a/data/fonts/fallback_fonts.xml +++ b/data/fonts/fallback_fonts.xml @@ -52,7 +52,14 @@ </family> <family> <fileset> - <file>DroidSansThai.ttf</file> + <file variant="elegant">NotoSansThai-Regular.ttf</file> + <file variant="elegant">NotoSansThai-Bold.ttf</file> + </fileset> + </family> + <family> + <fileset> + <file variant="compact">NotoSansThaiUI-Regular.ttf</file> + <file variant="compact">NotoSansThaiUI-Bold.ttf</file> </fileset> </family> <family> @@ -67,13 +74,26 @@ </family> <family> <fileset> - <file>DroidSansDevanagari-Regular.ttf</file> + <file variant="elegant">NotoSansDevanagari-Regular.ttf</file> + <file variant="elegant">NotoSansDevanagari-Bold.ttf</file> + </fileset> + </family> + <family> + <fileset> + <file variant="compact">NotoSansDevanagariUI-Regular.ttf</file> + <file variant="compact">NotoSansDevanagariUI-Bold.ttf</file> + </fileset> + </family> + <family> + <fileset> + <file variant="elegant">NotoSansTamil-Regular.ttf</file> + <file variant="elegant">NotoSansTamil-Bold.ttf</file> </fileset> </family> <family> <fileset> - <file>DroidSansTamil-Regular.ttf</file> - <file>DroidSansTamil-Bold.ttf</file> + <file variant="compact">NotoSansTamilUI-Regular.ttf</file> + <file variant="compact">NotoSansTamilUI-Bold.ttf</file> </fileset> </family> <family> diff --git a/data/fonts/fonts.mk b/data/fonts/fonts.mk index 7c2f955..05cca13 100644 --- a/data/fonts/fonts.mk +++ b/data/fonts/fonts.mk @@ -34,10 +34,8 @@ PRODUCT_PACKAGES := \ RobotoCondensed-BoldItalic.ttf \ DroidNaskh-Regular.ttf \ DroidNaskhUI-Regular.ttf \ - DroidSansDevanagari-Regular.ttf \ DroidSansHebrew-Regular.ttf \ DroidSansHebrew-Bold.ttf \ - DroidSansThai.ttf \ DroidSerif-Regular.ttf \ DroidSerif-Bold.ttf \ DroidSerif-Italic.ttf \ |