Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9b255cac authored by Fabrice Di Meglio's avatar Fabrice Di Meglio
Browse files

Revert back to DroidSansArabic font for SystemUI 

- see bug #5957987 Revert to use DroidSansArabic instead of DroidNaskh font for Arabic Shaping in SystemUI
- DroidNaskh was having FontMetrics not compatible with Roboto

Change-Id: I9f3031c250f907c80f3992f71d929dc91686e1e5
parent cf0c7d10

core/jni/android/graphics/TextLayoutCache.cpp

+4 −1
Original line number Diff line number Diff line
@@ -29,7 +29,10 @@ extern "C" { 
namespace android {



//--------------------------------------------------------------------------------------------------

#define TYPEFACE_ARABIC "/system/fonts/DroidNaskh-Regular.ttf"

// Using DroidSansArabic for shaping Arabic with Harfbuzz because its metrics are more compatible

// with the "Roboto" metrics (compared to DroidNaskh-Regular). When we will have an Arabic font

// whose metrics are similar to the Roboto ones, then we will need to use it for shaping.

#define TYPEFACE_ARABIC "/system/fonts/DroidSansArabic.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/DroidSansArabic.ttf

0 → 100644
+35 KiB

File added.

No diff preview for this file type.

View file

data/fonts/fallback_fonts.xml

+1 −0
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ 
<familyset>

    <family>

        <fileset>

            <file>DroidSansArabic.ttf</file>

            <file>DroidNaskh-Regular.ttf</file>

        </fileset>

    </family>

data/fonts/fonts.mk

+1 −0
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ PRODUCT_COPY_FILES := \ 
    frameworks/base/data/fonts/Roboto-Bold.ttf:system/fonts/Roboto-Bold.ttf \

    frameworks/base/data/fonts/Roboto-Italic.ttf:system/fonts/Roboto-Italic.ttf \

    frameworks/base/data/fonts/Roboto-BoldItalic.ttf:system/fonts/Roboto-BoldItalic.ttf \

    frameworks/base/data/fonts/DroidSansArabic.ttf:system/fonts/DroidSansArabic.ttf \

    frameworks/base/data/fonts/DroidNaskh-Regular.ttf:system/fonts/DroidNaskh-Regular.ttf \

    frameworks/base/data/fonts/DroidSansHebrew-Regular.ttf:system/fonts/DroidSansHebrew-Regular.ttf \

    frameworks/base/data/fonts/DroidSansHebrew-Bold.ttf:system/fonts/DroidSansHebrew-Bold.ttf \