Merge "Add Droid Devanagari/Tamil fonts." into jb-dev

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 \

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>

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>

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 \