diff options
| author | Russell Brenner <russellbrenner@google.com> | 2011-09-23 14:57:32 -0700 |
|---|---|---|
| committer | Russell Brenner <russellbrenner@google.com> | 2011-09-23 15:09:52 -0700 |
| commit | 9d8c7e82424ae2a8256157e288deb37d51509f13 (patch) | |
| tree | b82a758887bc814839f6cba9a5b9985b9d14c556 | |
| parent | b20d378cec09da18301eb9c33bc88251beb81042 (diff) | |
| download | frameworks_base-9d8c7e82424ae2a8256157e288deb37d51509f13.zip frameworks_base-9d8c7e82424ae2a8256157e288deb37d51509f13.tar.gz frameworks_base-9d8c7e82424ae2a8256157e288deb37d51509f13.tar.bz2 | |
Replaced Lohit_Hindi with Lohit-Devanagari
Lohit-Devanagari is now provided by external/lohit-fonts, replacing
Lohit_Hindi from here. Removed font from fonts.mk and renamed in
fallback_fonts.xml.
Bug: 5364436
Change-Id: I0b8f65dbfdbec1802fba526209d7f88d2cf64fc4
| -rw-r--r-- | CleanSpec.mk | 1 | ||||
| -rw-r--r-- | data/fonts/Lohit_Hindi.ttf | bin | 67960 -> 0 bytes | |||
| -rw-r--r-- | data/fonts/fallback_fonts.xml | 2 | ||||
| -rw-r--r-- | data/fonts/fonts.mk | 1 |
4 files changed, 2 insertions, 2 deletions
diff --git a/CleanSpec.mk b/CleanSpec.mk index d48904c..7bab945 100644 --- a/CleanSpec.mk +++ b/CleanSpec.mk @@ -111,6 +111,7 @@ $(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/framew $(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/framework_intermediates/src/wifi/java) $(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/framework_intermediates/src/wifi/java) $(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/media/audio/) +$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/fonts/Lohit_Hindi.ttf) # ************************************************ # NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST # ************************************************ diff --git a/data/fonts/Lohit_Hindi.ttf b/data/fonts/Lohit_Hindi.ttf Binary files differdeleted file mode 100644 index 73caae3..0000000 --- a/data/fonts/Lohit_Hindi.ttf +++ /dev/null diff --git a/data/fonts/fallback_fonts.xml b/data/fonts/fallback_fonts.xml index e468558..881233a 100644 --- a/data/fonts/fallback_fonts.xml +++ b/data/fonts/fallback_fonts.xml @@ -56,7 +56,7 @@ </family> <family> <fileset> - <file>Lohit_Hindi.ttf</file> + <file>Lohit-Devanagari.ttf</file> </fileset> </family> <family> diff --git a/data/fonts/fonts.mk b/data/fonts/fonts.mk index 5bac8f0..67d04c9 100644 --- a/data/fonts/fonts.mk +++ b/data/fonts/fonts.mk @@ -30,7 +30,6 @@ PRODUCT_COPY_FILES := \ frameworks/base/data/fonts/DroidSerif-Italic.ttf:system/fonts/DroidSerif-Italic.ttf \ frameworks/base/data/fonts/DroidSerif-BoldItalic.ttf:system/fonts/DroidSerif-BoldItalic.ttf \ frameworks/base/data/fonts/DroidSansMono.ttf:system/fonts/DroidSansMono.ttf \ - frameworks/base/data/fonts/Lohit_Hindi.ttf:system/fonts/Lohit_Hindi.ttf \ frameworks/base/data/fonts/DroidSansArmenian.ttf:system/fonts/DroidSansArmenian.ttf \ frameworks/base/data/fonts/DroidSansGeorgian.ttf:system/fonts/DroidSansGeorgian.ttf \ frameworks/base/data/fonts/Clockopia.ttf:system/fonts/Clockopia.ttf \ |