From bd1844d272afd7416a37765b90ecd843c0b99c9f Mon Sep 17 00:00:00 2001
From: Victoria Lease <violets@google.com>
Date: Thu, 26 Apr 2012 11:18:40 -0700
Subject: 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
---
 data/fonts/Android.mk                      |  19 +++++++++++++++++++
 data/fonts/DroidSansDevanagari-Regular.ttf | Bin 0 -> 123804 bytes
 data/fonts/DroidSansTamil-Bold.ttf         | Bin 0 -> 36448 bytes
 data/fonts/DroidSansTamil-Regular.ttf      | Bin 0 -> 36308 bytes
 data/fonts/fallback_fonts-ja.xml           |   5 +++--
 data/fonts/fallback_fonts.xml              |   5 +++--
 data/fonts/fonts.mk                        |   1 +
 7 files changed, 26 insertions(+), 4 deletions(-)
 create mode 100644 data/fonts/DroidSansDevanagari-Regular.ttf
 create mode 100644 data/fonts/DroidSansTamil-Bold.ttf
 create mode 100644 data/fonts/DroidSansTamil-Regular.ttf

diff --git a/data/fonts/Android.mk b/data/fonts/Android.mk
index 8ad15b6bc01c..13f2480f89f1 100644
--- a/data/fonts/Android.mk
+++ b/data/fonts/Android.mk
@@ -64,6 +64,22 @@ LOCAL_MODULE_TAGS := optional
 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)
@@ -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
new file mode 100644
index 000000000000..45e15e6ab1cd
Binary files /dev/null and b/data/fonts/DroidSansDevanagari-Regular.ttf differ
diff --git a/data/fonts/DroidSansTamil-Bold.ttf b/data/fonts/DroidSansTamil-Bold.ttf
new file mode 100644
index 000000000000..8ad008583d9b
Binary files /dev/null and b/data/fonts/DroidSansTamil-Bold.ttf differ
diff --git a/data/fonts/DroidSansTamil-Regular.ttf b/data/fonts/DroidSansTamil-Regular.ttf
new file mode 100644
index 000000000000..4b8f5364354e
Binary files /dev/null and b/data/fonts/DroidSansTamil-Regular.ttf differ
diff --git a/data/fonts/fallback_fonts-ja.xml b/data/fonts/fallback_fonts-ja.xml
index a182e31894c8..be53d1d493d7 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 69d223e3de3d..80fffa9c905d 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 0eec616df0ed..7a84df64dd48 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 \
-- 
cgit v1.2.3-59-g8ed1b