diff options
| author | 2012-05-04 15:53:49 -0700 | |
|---|---|---|
| committer | 2012-05-04 15:53:49 -0700 | |
| commit | ebbd247d83270df7c9f3c2f68d3ee9856c86a0b9 (patch) | |
| tree | 651d5816f5f5de6c864101af03b513037866372d | |
| parent | 5fd72a2cceae9955af316f32e17a84515c317738 (diff) | |
| parent | cf4284bce11acadb1c36564b067bce3b0b26a9f9 (diff) | |
Merge "Update Arabic font for SystemUI" into jb-dev
| -rw-r--r-- | core/jni/android/graphics/TextLayoutCache.cpp | 2 | ||||
| -rw-r--r-- | data/fonts/Android.mk | 2 | ||||
| -rw-r--r-- | data/fonts/DroidNaskh-Regular-Shift.ttf | bin | 114332 -> 0 bytes | |||
| -rwxr-xr-x | data/fonts/DroidNaskh-Regular-SystemUI.ttf | bin | 0 -> 158096 bytes | |||
| -rw-r--r-- | data/fonts/fallback_fonts-ja.xml | 2 | ||||
| -rw-r--r-- | data/fonts/fallback_fonts.xml | 2 | ||||
| -rw-r--r-- | data/fonts/fonts.mk | 2 |
7 files changed, 5 insertions, 5 deletions
diff --git a/core/jni/android/graphics/TextLayoutCache.cpp b/core/jni/android/graphics/TextLayoutCache.cpp index 2bd36c30409a..2c388935148f 100644 --- a/core/jni/android/graphics/TextLayoutCache.cpp +++ b/core/jni/android/graphics/TextLayoutCache.cpp @@ -30,7 +30,7 @@ extern "C" { 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" diff --git a/data/fonts/Android.mk b/data/fonts/Android.mk index 85a77d6e6f3d..8ad15b6bc01c 100644 --- a/data/fonts/Android.mk +++ b/data/fonts/Android.mk @@ -125,7 +125,7 @@ font_src_files := \ 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 \ diff --git a/data/fonts/DroidNaskh-Regular-Shift.ttf b/data/fonts/DroidNaskh-Regular-Shift.ttf Binary files differdeleted file mode 100644 index de475ca6afb7..000000000000 --- a/data/fonts/DroidNaskh-Regular-Shift.ttf +++ /dev/null diff --git a/data/fonts/DroidNaskh-Regular-SystemUI.ttf b/data/fonts/DroidNaskh-Regular-SystemUI.ttf Binary files differnew file mode 100755 index 000000000000..5818b4969efd --- /dev/null +++ b/data/fonts/DroidNaskh-Regular-SystemUI.ttf diff --git a/data/fonts/fallback_fonts-ja.xml b/data/fonts/fallback_fonts-ja.xml index db998d331712..a182e31894c8 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> diff --git a/data/fonts/fallback_fonts.xml b/data/fonts/fallback_fonts.xml index a4b5212aea48..69d223e3de3d 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> diff --git a/data/fonts/fonts.mk b/data/fonts/fonts.mk index 702b06967f5b..0eec616df0ed 100644 --- a/data/fonts/fonts.mk +++ b/data/fonts/fonts.mk @@ -25,7 +25,7 @@ PRODUCT_PACKAGES := \ 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 \ |