commit ebbd247d83270df7c9f3c2f68d3ee9856c86a0b9
author Fabrice Di Meglio <fdimeglio@google.com> Fri May 04 15:53:49 2012 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Fri May 04 15:53:49 2012 -0700
tree 651d5816f5f5de6c864101af03b513037866372d
parent 5fd72a2cceae9955af316f32e17a84515c317738
parent cf4284bce11acadb1c36564b067bce3b0b26a9f9

Merge "Update Arabic font for SystemUI" into jb-dev

core/jni/android/graphics/TextLayoutCache.cpp

diff --git a/core/jni/android/graphics/TextLayoutCache.cpp b/core/jni/android/graphics/TextLayoutCache.cpp
index 2bd36c3..2c38893 100644
--- a/core/jni/android/graphics/TextLayoutCache.cpp
+++ b/core/jni/android/graphics/TextLayoutCache.cpp
@@ -30,7 +30,7 @@
 namespace android {
 
 //--------------------------------------------------------------------------------------------------
-#define TYPEFACE_ARABIC "/system/fonts/DroidNaskh-Regular-Shift.ttf"
+#define TYPEFACE_ARABIC "/system/fonts/DroidNaskh-Regular-SystemUI.ttf"
 #define TYPE_FACE_HEBREW_REGULAR "/system/fonts/DroidSansHebrew-Regular.ttf"
 #define TYPE_FACE_HEBREW_BOLD "/system/fonts/DroidSansHebrew-Bold.ttf"
 #define TYPEFACE_BENGALI "/system/fonts/Lohit-Bengali.ttf"

data/fonts/Android.mk

diff --git a/data/fonts/Android.mk b/data/fonts/Android.mk
index 85a77d6..8ad15b6 100644
--- a/data/fonts/Android.mk
+++ b/data/fonts/Android.mk
@@ -125,7 +125,7 @@
     Roboto-Italic.ttf \
     Roboto-BoldItalic.ttf \
     DroidNaskh-Regular.ttf \
-    DroidNaskh-Regular-Shift.ttf \
+    DroidNaskh-Regular-SystemUI.ttf \
     DroidSansHebrew-Regular.ttf \
     DroidSansHebrew-Bold.ttf \
     DroidSansThai.ttf \

data/fonts/DroidNaskh-Regular-Shift.ttf

diff --git a/data/fonts/DroidNaskh-Regular-Shift.ttf b/data/fonts/DroidNaskh-Regular-Shift.ttf
deleted file mode 100644
index de475ca..0000000
--- a/data/fonts/DroidNaskh-Regular-Shift.ttf
+++ /dev/null
Binary files differ

data/fonts/DroidNaskh-Regular-SystemUI.ttf

diff --git a/data/fonts/DroidNaskh-Regular-SystemUI.ttf b/data/fonts/DroidNaskh-Regular-SystemUI.ttf
new file mode 100755
index 0000000..5818b49
--- /dev/null
+++ b/data/fonts/DroidNaskh-Regular-SystemUI.ttf
Binary files differ

data/fonts/fallback_fonts-ja.xml

diff --git a/data/fonts/fallback_fonts-ja.xml b/data/fonts/fallback_fonts-ja.xml
index db998d3..a182e31 100644
--- a/data/fonts/fallback_fonts-ja.xml
+++ b/data/fonts/fallback_fonts-ja.xml
@@ -34,7 +34,7 @@
 <familyset>
     <family>
         <fileset>
-            <file>DroidNaskh-Regular-Shift.ttf</file>
+            <file>DroidNaskh-Regular-SystemUI.ttf</file>
         </fileset>
     </family>
     <family>

data/fonts/fallback_fonts.xml

diff --git a/data/fonts/fallback_fonts.xml b/data/fonts/fallback_fonts.xml
index a4b5212..69d223e 100644
--- a/data/fonts/fallback_fonts.xml
+++ b/data/fonts/fallback_fonts.xml
@@ -34,7 +34,7 @@
 <familyset>
     <family>
         <fileset>
-            <file>DroidNaskh-Regular-Shift.ttf</file>
+            <file>DroidNaskh-Regular-SystemUI.ttf</file>
         </fileset>
     </family>
     <family>

data/fonts/fonts.mk

diff --git a/data/fonts/fonts.mk b/data/fonts/fonts.mk
index 702b069..0eec616 100644
--- a/data/fonts/fonts.mk
+++ b/data/fonts/fonts.mk
@@ -25,7 +25,7 @@
     Roboto-Italic.ttf \
     Roboto-BoldItalic.ttf \
     DroidNaskh-Regular.ttf \
-    DroidNaskh-Regular-Shift.ttf \
+    DroidNaskh-Regular-SystemUI.ttf \
     DroidSansHebrew-Regular.ttf \
     DroidSansHebrew-Bold.ttf \
     DroidSansThai.ttf \