commit 0102443c4f52f2e15fd731c452f0c4745312d448
author Raph Levien <raph@google.com> Mon Apr 01 17:07:31 2013 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Apr 01 17:07:31 2013 +0000
tree 99f8ce13d8fadd5b06794013bacd14c163e0e977
parent 63fba8c12e3cf3e1fba39d9b76e230e25f98953c
parent 15b8c185037410dfd15b65b2246500e0a2545c5d

Merge "Rename DroidNaskh UI font" into jb-mr2-dev

data/fonts/Android.mk

diff --git a/data/fonts/Android.mk b/data/fonts/Android.mk
index e02e95a..7f8d5f0 100644
--- a/data/fonts/Android.mk
+++ b/data/fonts/Android.mk
@@ -152,7 +152,7 @@
     RobotoCondensed-Italic.ttf \
     RobotoCondensed-BoldItalic.ttf \
     DroidNaskh-Regular.ttf \
-    DroidNaskh-Regular-SystemUI.ttf \
+    DroidNaskhUI-Regular.ttf \
     DroidSansDevanagari-Regular.ttf \
     DroidSansHebrew-Regular.ttf \
     DroidSansHebrew-Bold.ttf \

data/fonts/DroidNaskhUI-Regular.ttf

diff --git a/data/fonts/DroidNaskh-Regular-SystemUI.ttf b/data/fonts/DroidNaskhUI-Regular.ttf
similarity index 100%
rename from data/fonts/DroidNaskh-Regular-SystemUI.ttf
rename to data/fonts/DroidNaskhUI-Regular.ttf
Binary files differ

data/fonts/fallback_fonts.xml

diff --git a/data/fonts/fallback_fonts.xml b/data/fonts/fallback_fonts.xml
index 744b15d..16d760c 100644
--- a/data/fonts/fallback_fonts.xml
+++ b/data/fonts/fallback_fonts.xml
@@ -36,7 +36,7 @@
     </family>
     <family>
         <fileset>
-            <file variant="compact">DroidNaskh-Regular-SystemUI.ttf</file>
+            <file variant="compact">DroidNaskhUI-Regular.ttf</file>
         </fileset>
     </family>
     <family>

data/fonts/fonts.mk

diff --git a/data/fonts/fonts.mk b/data/fonts/fonts.mk
index 875795a..7c2f955 100644
--- a/data/fonts/fonts.mk
+++ b/data/fonts/fonts.mk
@@ -33,7 +33,7 @@
     RobotoCondensed-Italic.ttf \
     RobotoCondensed-BoldItalic.ttf \
     DroidNaskh-Regular.ttf \
-    DroidNaskh-Regular-SystemUI.ttf \
+    DroidNaskhUI-Regular.ttf \
     DroidSansDevanagari-Regular.ttf \
     DroidSansHebrew-Regular.ttf \
     DroidSansHebrew-Bold.ttf \