From 9b255cac775064038a5548c983205b2dfb029841 Mon Sep 17 00:00:00 2001 From: Fabrice Di Meglio Date: Thu, 2 Feb 2012 14:15:29 -0800 Subject: [PATCH] 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 --- core/jni/android/graphics/TextLayoutCache.cpp | 5 ++++- data/fonts/DroidSansArabic.ttf | Bin 0 -> 35880 bytes data/fonts/fallback_fonts.xml | 1 + data/fonts/fonts.mk | 1 + 4 files changed, 6 insertions(+), 1 deletion(-) create mode 100644 data/fonts/DroidSansArabic.ttf diff --git a/core/jni/android/graphics/TextLayoutCache.cpp b/core/jni/android/graphics/TextLayoutCache.cpp index c797a73159e54..1d953f33a2961 100644 --- a/core/jni/android/graphics/TextLayoutCache.cpp +++ b/core/jni/android/graphics/TextLayoutCache.cpp @@ -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" diff --git a/data/fonts/DroidSansArabic.ttf b/data/fonts/DroidSansArabic.ttf new file mode 100644 index 0000000000000000000000000000000000000000..bdefaacb04df6cd7671233775f9f8ddc1c14bce3 GIT binary patch literal 35880 zcmeIbcYM@E-UmMOZCkS0zMEu|klkzwkU+|&5CK_2Hby`}KrSF9p&5`4il_+K!QMFa zILLXP=b^%)5z#{hPi$1rf?YXm=W(Zxhnzt2&F?+)o!umW_uTXRUccwBAK}|)=2ND9 z+RPG42yx-05a)Syv3j*tokYmBjd(lmywRh^-f;Z7bUZ&nh@X~pI zdFQJ6gji6freE5;WFaw=Oq4$o-))!9T|VoYS;L1D;;A6yk})kan`iuV?U7QHpM~#L zEqLKvqb|ntI6UXI%v*Zp^~=*_JpTlIE}Xkydh>_5yY2-+3gGvj*L>wdDU+q841REa z^Sqf0{(1ku2$_Ei(yv{(V9C-scjkUb$PzChDb))X&s^A`KhY2P0zWd9Fy2t<&gZ^; zX5duEpdU$!87~NVZENUSc73B|X}f-R``4Cj<{@~r@$~Ei@|lOUe+@bx*6;2(WZ9Pd z!oK1kb+I?pPX-c|jKCogCn+Hl@#zk-9#53W%3JgSag-f7@q9wKM3kL;hin`0Uzin5RFl0db3J<7sWLVZj5 zWQE*9>f|^XF1b5*N^UYxX(5Yn9jTrqH{!Zkt06Zk8^|Jd<@XPfNs2h+zmf<$q)na6 z*052Re_cX4KEsxPPGYD8pZwf%iI=hcaoB*N7fdT@88Dv)!m+-$1^z4nS<*-l)V%D7^pO&9k!5J3`PPTo;P>r zgR%|nvO8b8-Q!!54?lYk-X!@0-dG+6pYH^%+dGf;xL=3&jd;Hr@4MY=t6BRt-gm!O zO3>b`!7o-P-R`^BlSu-8qRzV439E+$y|^dJyPdmLr%^wN_q?w#+7tBxUNJtIGf6`t zjXIGGMPDC^>m*z!oqlCClK98lJZl#MAJ*0xuB@MOJW)RC2Y>qU&UKynovl14#w<3f zVH{MXS8yGTQAowO79_2jP0Q4Bv~#ra+B|KMcC~h`c9V9CcDMF`_K5ZeZHxB2_M)~+ z+pGOqI}vmg4nH;FRP(8Mr&gT0|J24)TTcD;RA>8?_U4Ws^v=#sl-yNfNQ-Js+Cpvl zzbWzipbaICJ~idktW#H=y5-b{Q;(kd=2SaMY(j|(QRI=%=_h_V@$HGPPkeRa@QL?N zym#WjiG3$tJ+b@53n!jE@x+P8PW<-7gD2LVxbMW;6E~h{`F#8bn2%H!ry3{ai1Ikj z1C(m%_jqJH_@Dn{Gh8t_2Rvi503nV1Y+TPHmy#ATo6I4XVYZk{=8^ei30X=mCs%;W z%gB{vIT=Z=B3F}Z$O>{T8AVoNLRd{MBG-}Y$qg7~ZX`F6o5@&m3mH%DCnw1%@(}qI zW}07<4P+x}CBGpLli!j@$nVIb@__CF<`kH z$PeV7hhyR9hJMAtSb9rczv5W9z9}AT4#sg&3c?Nef>+_@c(5rL zFTka_+v}!y6e(w&mNIIjj3!f3XK)Z1#6X0D@qKmS;C4FkqDI``UKgGajQ^eAU%>B` z0{)PShfoMPI93eXU@TsLMa$Y)6L6$kQ>??n!)99h6_c&j6x^oZF5Wx5a4YS7F6B2; z@7Ot8C1OrxU_oiDc}9HnMUAn#%ur}TzvA=b_ApAqCo+r|8P|rzO}xn9Y)};^w+6Qs z?_7J^b|;zERAieGp3yw1F)lYF?^-#wcJ0k^S5drAxGvu3sxQ*PqnYvIa9u23#7Z48 zCJARm7f2dc^PS<~+8+tX3IF{l=;-#QS-jEmoj(%xu^tt%c5Qt)SiiPuZS(fdRnx*j zXL#*an{DmF7&uHuH^wR6KYwdxy#BTcac5HtJx35*KW0SSbI~P@aVft(*wPI0@qb7- zG$1qN0s)*M^~itr&jgGBJHXRWh!KA4_9&T#hxn?C8ja^5nU?t!iIx;ih)YfE%g)3X z-^J|9s>GLM_NFjubHv!jwQ(i?{2AdGczkPfeAP6xr#Y-D!p^w;cxEWP*6j+`lmJJh z4Fc)&XUq=9)q=Rja&^yuR>-of#R-*QKW<$9o(TX2E_bjdjAB?hv2d(O{J)|l9T0>4 zisKDMM%9mNj7RIhjcBuI7O}0RCCJg-gescNYVxAScu9C++#9Yn+6`VXv|_WzHu5aS z+gRK?EDlXWKMsvx$u zamK88PE+O#^t4&Q#>`MWIsp|tA>24~0&8gCP@m5M4*x(_TpBj6am3j0h>IpRqE`5o zY^0eaks4^k`vhY%>qI*C+@nxD$oaz>5~XSE5#F9q9hL)bK~dn=LE0OW_o@;Kk+%Z)*K!&b}g%kuqcoK^Yi0`HR0$07sy6m zXZ<;h(KhHrkLLY(?bc|N_2m}UZP$j+pRqPPws8&F|OSb zCl^n=q;V^ycTBkP_S;Eq_K0}-*v5EM_Jk4f8MukEn^m}RW^eVA+6hJJMDuFbn;O*_ z#3vt?k1HXy4ie>2y-9~IN=U~pcK-kVpP|nKPLB8+1Uc&|@^@;c`E&psL1)k_>D}~E z`aC^AKavWifzotoh4fo#o17~TkbfyZF8@P5shqD&QkE*WD8E)Z)Dra?^%nJc^^|tL z_M~>e$jNL!NjaN4HyzUkMb|Cq5prTH=4+XsWd4w4&hloJWDU=HAZuT?mL16M zpIw{1Jo~=v{n>|mHT8<;_;QMJqB$4mydHD~=LfF~-XHu!NDhq%JsEl~v^(@xZZLO3 z?hCmGbC2Y~DY~j?Z*f`i zO~t$WDgBE3)%Lr#-yhIgBuKSHv8vmk@tBD3S%`WN_e_M8l$S(kNu(rFR_Y14Le)5S z$>+B}+afLRxLMtHa(IjK75e!&Lg?-EIMGO2)FLYyr6w7o_Kgh3ZYc#I4JN&$=74I-FoY7 zU=SJJ`44%DTo1hg7};#ZrAlD2&nE#HkE%*mG9=;xu@Qy~Eh%}0-<6i-=c<)e)!i`i zdDHT$@74xuJeK^4?^R@6!z&K&1dr|hKLJ5RQ$c1g~sMU})gxe_|*K%{-mY)$5>q#AMs zqju^r<(Nj9rkXaIR1IzJRqy&MF}AKB4P z-`Bj!@~dbX%1_xwEv9r)98%q=Z&vS>Pasuaqbz#wsqaYIGt|+S_66|w+xqrZ)dbo| z0*#K)8JZXE*zpWZorIzl4nh5vmW9Hu2%WKQ8$R-qZ%}WQ4@(8$2)IH$a`uU@(0c7O z>TGgKPU`c!O-Y8Z9E)J<=%-!}Tzc~yZV8q>;@m1r+dK8P%pBRm@L;@y%}BkKr4(hm zWmt_!>a!9p@CS@SD>)7G(Fv%>deWNa#Cq(nlGT4RI4M$;b7gc+!YyuwjM#FnjCTNFL%|{fFHSN*OBt- zG%cK4Q0WYX3giN`c2gnRy+6&J=A-RL=1!b@MZc>yw(X`H=$g@GIg1vr-Po|<-K~2H zDrW9!UYfsV;GV5?`gj_8X6=~UXTI=H{i#Xo8D$(_&MV-{xGTXNOYF}P+PST*Fq|6X zRYnQy!1C=%2%33b)TyAyQ>s}p7ML-Jn9v)BM9OIiLzwl5(z5E1lwYlQd?8q5Tl8(U z^tUV8A8nOJKDhpoj-2&?%gf_%eFj{*4RAA_rH<5+R4ElL=Cd}3L++|qAhcZf(subU zdPh3?gw3R-suq)C1M~=MI1DazdBLQ@YOt%S(nZ@}+_K@yG2`bK_M=PG1pS zceRp*zJ{_S8;6h9%;=^M13p^y*IuWF85rFQwRWTKHSYn$KID>UaWFSGo2I4p_L$9T zZ~WP^9k%>{P3x0`KW}P^)9H2l{fgqXq^fAj7$DeRNdzpx$i*tw7`^y|@sXW5(*6ib zj9O-wP;Q}*9nMfVSE_VYM>PH==yEAft(dlQ^NQ&!H|rlfK2ZMhEuUiPp;vMxO#*tUY7YWz@Sg%nQW* z6q@sP`gq%bLD>%8MJh2qGakGsABSxukJLtk*{(pqZkPQ*&1{x4a&ppC)sbd#g~J}r zp{Br6Go+l;j`12aqa%X>U;=9vt_UOcG?Kuc5GXU~rT$3BubG%?(6tTcW+py+vGuU8lwvml)lL8In$_T4L%;$z9srt zTT!9x=T$AS5m4QP0mlwIQDrp4fiYB;X^NX_KA%}rh~4F~*(5ebu}Kb<$?6v)e-~k) zP$ga^sX-Iuq|goet*<3$SUEEt$4*Wxrpp+jeNpjgc>vSWvO=Kbr8n!#TU${o#%9wTRw{t-QZ>dCR&!E*TW&Ae!wN>aNxD}n z;_3LTN!e3BhI~ix<>|j3@t4ky}e)59|pI*W|B>_-43tIkwI*hAa7P@YScK#Qw&`*BzPyKJ}=6>Hak!G~qc+Z}V4?gqG)B9O_(7no2%0~2! zv8Z1*Q$5g`1&sM@4~(s__F`VJqP*ZjeI?CUS-a6SH+p8sn)Xvd+?+H|-R0E0bk&(jQhXj& zlLM(1v&^O-)=CmGFay|a9;#&1HlT-8NT|+G#3euf)8T!;9kcQJHLb6I_#Lh2pf>&F z_BUw8&a$_@oxNtvz1I%>ufH6lfsHReuJ4gBF|oR5^3`zySuN`B|%EGb(KMjpwT^9wqX&KhyekB7EzSX|S5 z#q@<2-ubzH=%l{+y=Nc3=l;9q-|^-6xplX`zhTFq`^%cfH_RV?<$EuEiD8o5*s;zu z58PohL@}w4h6;;T<%F$SVf^{ME=BctRH;uWl%Jhpw`0ndFg=1_C6WE*7^0ZOK$-Ru zF{Viu>r_CVF)Hi|qbUPN&Ot#+BU3(ACjnPwG;S~VIq5!JLx zrqDlt6L=e73X+`fQ++tTr=ROVc9?E|YJS_YrxvskNxxegOqeve=Uvl1x&F2Nm%BMDr8OUfs48ZsL4?Sp+=_=Lq z-_W8Dd3ph8nGccN;D@OZWu!h07llkp_R*4k1_LDuUKU3d8Bd0d7Hxl8rG6}5*sa=E)99?@(@z7agE}Hu7#>KS%bWpi^e8k>3 z{({MqV+;TIK*cW_#tcHA=yY}*5Htcmz&ZmzP7G4&&udF)gV_duPenA~Rb8%(QHZgS zFq)~d-|BW-{W9cl@Mdqsl?M3?wSt=2JGq<B8zlvu)F>gJ-?Edj62|DbL(CrE<_O!Jp0?_^ywbE8)xXqh+Od7h0&r zA=@bcJtEd)0Zx7 zZoZN>460l>sG^c_L*JpTq_w7TsDofM)f%Nvi)>qEvQcUS|1rS^ocqerh68&6Ck!BI ztOg=XTE^J?_2i64swQ2M(~ypv@=GR#8?=>g_v<$a2jg_5HiPU!{rWNU*jy%?$wp)c zG+{IeR-d$FKkK{9^pLBV&NB7w%GKW<+}yCJY53rr(yGhO&7U${TUTJ4YA?O$7tOsU zXUrZF((FvV>#Xc(C%ZZyM*jg7PAvsvo8(p`yTwnOpMq6MSfyp2GiTYV>Rs3BKQ!}s zH763e?A)gVdcWjMn%*)rCj&D&?c9ytQKMhZTed`a2geYEmW?52;L@e~<@#bMI7O(s zhv-VAvbRA)<-#ADMOkSG#ue!y{cgGdUn%_n>F$I*QE0LtFFwL7ZA@)=(-FgHbF2EmB}+4K__9wR+Z2*g++$KJrhKdgU+JR@AqA+@NiD zY`G>@78#UIOVklZ{za_#Dc|#H3u!bvl#ArK<939}r+Yq?#Fh2=rmRPm@C{H%?wL>-D8K z?|$aUE5AQ5n|i+;aQFAyrTFUKtn6EGPSG#>-P9b@uX}h&a00cCT3_}|diMS3`{Q9H zaI4GEC)2px;PAsa)ab@GO5Ppl=8s{rv#Y_(z8@{@-X%7eUrLA)H@!!`Oy_i zpIqamZdkG>OIpWC{kQs8`VYT;<2719*Xv{Sqp!UIKGdWBm!bAl;&~Pdw5%8{h07@1 z>Jh38$;-BN+$fhRFFwjRhuAKq5IL+QH|mfjvze+)5L9F{mz;%oO6UoV=x^^8)@CP~t)7FCl>vQ=a9_-UmU6lx|J z1=Fy!XrO8<`{@OG-4S~IOY)}A`=7tNeLO229e~9X$=lWC&;WfHB~m?Vs*OlKpVO=u zjgO1Y<(TI|s>`UyNV(hPlAQ(2a_0=mwy!_^@w2v{KH9wMcb8oQaD|^AeEDh>0EO)CN%UiMCd4G;0l|kQ_!X|oZyMongSA1&=)ktj6X@1CD!N@vO8ErOJ0T0 z;e2&6Ms%=Bjrc&8FRYZczq>&$>KJh7kd%Mukio5+4|Oa%gkrDPf1*3!%h%W(sK6d4 z=D_?k4Wno^-E6PAYR$O?|42Ki|5qo%`;dd?&>gb(j2yIQ4%zExS&k#e7-^Z}<+`W) z*$H-Px3g%vl6@FL7^ZT5n(8sha-k=`T9u^-is1tC&16 z-%V-QFlGvLi(AhdRd7Enc^|wrfBKXuix!~R^rdf4MSUhZKN^vNYBUMHcbU!tYX(awd=RnEJds#BtcUD;qQHEekuhkE37 z%5{KY*zyJ@t$vlzPMK}&0eL(8GlhtdtR~~4z0GN<&R)H0%B!k!a|`*yb24r2xT@j`n_u&& zDJ_MI?)=>|u=%|bAb0{h>)^ujT> z&v^AO`Ztr-FPJ6%y>jWSS(k$Q+$N{Zfre$+o8>zOMgacoTed zIWNU8-?(Y~oaJ;m?eqHsbkW517wMng`_Tc6gd8Kt%_i6xqS2s|n~_hlvz@jKpU3HT zr<&yKd^NW&L_;(^6&7SRGY^@}CqJ$VF%1qk`y zf6z{S$pzHP(EB;uRpmZ9YvP*W`tN_U>7xT3Z@d(r``DReuyKs*+tBJfOj>an%4X8S zm(VnUAMANd$xN6incYE{@7At{O%gT-*y_w*{cHcTx{jt=FMr)$sN0y`2(z0SSL-B= z+>YA)KhWga2xI8cfC)bZo+s%|>PYEEJl_o*epcpVjipQG>+DR(e8^YB%Mr32p3mXW zLQ=ys{4?MtdmgMl1g&sZv|6#4RkPWYmXfM!ikqftZnu_-*(`Gi*GkNCiXvrXW@KtU z&z;VV@Nt-A&7!i=cgQP~%Q1d1VVfJhC&L}a6&A>FnBkH_9OextOsY&ENb{!|S_OBJ zL12P7rwrEDzkUm?`x8XDp}$x)X5Nf*2WJB)QBeb=tKUYm0DV^=TUvig!) zOX-(%rZli)xBjb>f1?*{ro(9oeM`^OztrJApoktM^7D{Ee57yGW3j*iLF|&^hN%?R zJt2oMA()NCkyp!^D-jM)cYdBL=|l8+)vD?=B0n~lrs$9SZO4PF246P!dm3(8FjV(n zODFtgES>Pu+vonWvi+asjTH~+-{@FW@c&C{XOq+@;>#rxQtKgOa37z!OEap5kPwPS zB^G=^5rZy~HEJBz_eeB@+HI-{%ByCv5L=4HW?{<>%&Ce5Wpi(NS`D{5G9?BIE&fBA zDXdPbPBW#M3SlrZ6&6k@Y-(cv5inV(_Gv1df)`T?hn&h$J{w#JXbh`;@Hk`rM>GXm zlcJhssi z8bQgv2$R~3{IZYRuY83Qm!CUuiMr>;lRH#p<-81LERB1YH zUQHkAB;(t))hUouI|-eq-%q9SodoIH$LRXKOde;0_X;6DddNA^Y=^^_5FuUNMMyW? zDByDBEJ7rA0GuXALJK}klB5}WSvO(wwN^u#{C_14zN{_d-et(#@Ld>^Bz&BZBr`^5 zEX-JyaaV?#!6cup@Q2FWEzVuz3Dm>=^A>=vd{r%b_|L!BWaJ7s8>!h_fO zT3b#6Qv=IG(uLiybW-jQ=icjUYzf2?DZArjq%{13oj=uE+vD@ED39ULZ$h)VGE_xztT&ZnwsdZ zaT?sz)O^+`h8L!{_Eckxo^?pc;V~FHIe(lIxGyw3H6z>Y?BZm{A>|34a+gTi)idNk zFAsNK@<@^YrEbJ@DrGruQ@c3?FJ)^i44n!AXi^rMt=`e*$#SM}th(z|U$Z*KiUl^Z zbk~)pVzpBf2@7{jLyQ8EM`rI2`0DDCn^6% z*;;r>NPB$XE*Pn^?w`Q^Z!^~7tk!IUTM+3}U}a-QPQfkV_3p_lnq&t|fv007#~B-*tZ5%~HtgsO&V@6Ogsj3x zV6Kn$CymkK{-i)D%C-4?xdr&ka5_uj@XpNio8*H2YEd1F*YY|-A-7-XrX1rQ`e~w$ zSp_@a+3Va7Hg?xjyK41kEB_3Ib-^T7#s8Vw`pMW!QQ<$Mx=Oqi+|23Cgr1V)w_}($ zo3j*8<^e0Un%s83>ZwBpX*%d=Vq!udJju-R|o=yGg(SuCLh z!eIQ6$y~KE+^5dnATJXmU8H+wDnFu&j%?Ef!k}^L(=bh|Q$VR|N530*ie?X9_cy9~%zYh#B_M^lcMo zG~D{s#q%%wpq0gQtr$|*I(x)rtJz4WHz|*iR%lEGQI|!5xeH4L99Xk$w79Gs~Q9^GMhg9PAM`>xrz2ax{nx7=Yi-*7)|Vam z^ayoQ$Dj>SeVzVXgMMW7uO%2&Bo@o8Jpu)iMGlXN7G>EyG+1IEVjpFf?Lm9cG!IB>k3`+29I%tH_+yKBn1KLzoXK-LxUolb^F z;7?Zwe2<-of7YFj^&EX=mVvUK+S-E>y++Vr$dbYa_9L?!v9XKMgm!zJw_9PKLS4Xb zoNBdt6q2I)5fX)F#KO;b-BLcxR^?a0A z(wlBsweWW>W3ISm^yuHdICJ{s^ZE@$|KM=Yo?Oh@hv8C5HJhv{PGLJ0fo`lud5|>^ z9%D5d3CY#^fw{NT*2ph0Sk(Cp^*2WQpVNBFs++eOGcwbV;PXOk4ro&-Q7uL{Kpz0t zMbn2BDSew>&YQWIRhf2#_6jB z=_)Mh@F1n8Mn(mu2Bbik(t>bKc4;1JuvG5TC&a^0oPiJzL}9hVrXBos1$waQK2b03 z9`yplFifqoN~54Vw1wtpyEL zgDSo`gJPA{Jghj^{zLX$X$tdEWYxwiVLPz4r)BHT*I2`e|>!PMEf_&m{Xf^*yT+9c|_1%%|=!c-Gx41%tu=6 z3qd!Shd{%EkCB@27Aq2xc7znGY?v@QI}+27pz%RA=Y#qcpAv`}h)jt|Gr)QIPjF8uJEz^{bk$0PGQ z+f15)9 zkguHQYXQXLW?M2}InRgqUt)*DnyIy{bP)rET+oT}ybrnVHdiKdMR+czj}lX=K$4}~ ziK%`CUlp?zIeM&$ap$ocLv% zC18}9oNL(17&h0KNG08I>O0VdnO?H+)i?JVaA*TxeM1*ovkYSsqn@QYz*BKs6LK4C zbSU-Y8+ImSW}IWVV3zeGw%UXpd@!pqS({m-+04krSuCpI2GmxVO;I*x!5ezm5RH{J zY`sx5qbXx!hMWQZY;1#-j$1vA^+u39Z|Gt3^w5D=;gS(`(kS-B*r>@GZLygJ1*i;8 zg?>X1Tc?M%B=R_#92*_7gIawqL64D#?en4R;Zfzs7=Nf+VzKbXDxN>KWn{~SnTyc@ zxndcQ0LS#eQW~psxJ5ADWeOGC9M8+-JckO1s19T_+xz5uW7Cs}LVd3j$22H@` zwm1W}u`)>`L`cX=Fcx61;=k}D>dAj#KTp|702yed>F&k#$h5MRNTRLwfI zueIk|s#XCB)U7kC~g)*z2lt`D_WN>6JHQFSPHu)MFgdgh|e0HoyNm1SIbk&b|a*IvHoNX)|V-gO9;L3c#e5mXmxeo~? zp-yyLOZLRVOM==HHD$^5WQJw|{;^eMUvo?i8*6e^+2ZUB!^8>#Fz$LS+kja)nHQ~c zm6qDmi;I0Zy?bZbeOXyPyDW#p6~M1BH@70QPoI7zMP6?|KU_hoBRjvJCA({t6*nFN zNBr>ij8Gh;zkkA+x?wPy<^G4i`spq;)J ztD*ZUw2nKbE`+hpSc(SfS$|XygZfOY!Rf7LW=giSG|NuQL5n0=B#Q@81qgT`R#|qb z{(!?wX}Z@iGc!9g)OK!XfT2M|t|o|MX57;WVl=SBOG`F$ab zxr7Z_+Xwve$h2rg&C8Q)!Jx&HmE~-OAZ>9v5nG#Xvl;$)!9Wag5tIE_TLl$D+h>qLu7Rzr96g&FMZL7;?QBx=cV zqzk{~*l1Xndt%vx(Pu*!{53sM)4sd=(#HhSf}O_l$3%V&yuCtS!rxJ@qdveOCnut8-I|&=52{&Bhn4+Ni6m(E(S1~$WjZx;OQuwsN##u0Xn!;)*y*E;q20L&%o2DC(;lDW zl17KqJIT-SG}&AJW2QpR5bXe(8k3G#dx6GbNJWg-c>mt%?^(OS`$JvtF~4IytWt;m z_kX%t_fW^?|6sMQG5^Yc0(Kr!ig;D4|$H?4_~0Y0Afs@MXiF+`5R)YrXE0 zv`_PK;!@YssmSHG(-xx7dkrk{BBO**-H3LBkx zz4GzoBV#;~#`95!rX<%n8?8nD6HoPV&s5h2{KhmY+LZFHx)W{Z6On2O8BDONh2$tG zDUb>zcketCpGvtn3+T{t&0KfIf-XLqCD%jKEp2&0Ba(#3T;Cz;^{_NBOKDX!LxOJz z2Hlhtcy0pD^fa>>L0F30&Q@XWM_31+T9YFJ6N53UCZf!Fg)@U46>C?er!Ko}PRAp3 z=p5P~I~Lkb9hL3d_R#cQ>h)|H<*DptFMda}*;>n;kLzz>@v4E*5sr}uQeRy($T3Pw zOK}EL@Mm_pvf-Z1aGK2?Am;6cSdTh4ru?754@%QnFf5~l+K!yE$ad6XcNCA&^!Arp z<=S0Oum!f@E>@A7(pargs0z%6pge)PO?_6DzUyCZpWIxF^Xy0jo<-U2@U2ts5j~a)qK;>n}zTM6$qI ziZvL6yG_l^(=LYW?(;I=e4(%#Rs(5C9km`Z zc3imoEITc~wF z7{6HO;S5Vk3BZQ2E592)SP3HVxnu;GwC4F={o&WER&Hv&>{Vm$hs)lmXl>o~_m7M^m{gz^M=i(Xp9qVm>}5iCE`m?LUkXU zq}bS@@>s_w*x4cd+n+wdh7Nqr5t}*~{Konhu6NW%LsBBpf~3&@G}eNvj%}+3elpEQ~M<-mgTI z1$PhwRo-yXVletL;f;2Sv*<~{S>h}jdQ$Ko23qhPJQTJ^MLMK%j0SMqW5+EorMX#N z)NV$aN_zE@T^5MIhFOrSA;PDf=xE$n3%jM^qGv99#9Q!S9n^i--X2ds{d2o}w6^}c z{XJMj0{rg-q52|0BSaKBl(c{)%V%ty!5yy&JD)LBan#P-C&R^@s~E7@ zHX5q8=jIsLF@qBQd~BLAanIqz79Z43>#$P>6OHsnXuqVPW1YE#<5hr}cTBW*pMI-C z`3%8)cOc--mw{s`$1&h53Wp1GdSLoadABV-7)yKDCHdOXe6IrO9qqPjcaQE^Cj`-i zXrvs{k93lMKKE+m!CvzxpP-jYen!S{kkK&_;t~BVPV3%0vUAI=Ywx^r)-vj#<|IMw zhnaxE4mLXI`=z1XqT=0j@X1m{hXo|+v`6iu?M?Po_Jj8C?IycKFHMHYGjUw_wD$M# zX~9Q?{Jo=CCFyiT5y9Vt2>yeP?;R!{!{5zq#EZblGZZ7u6WTDyoS3b+XY)q=JAxe+ zs3S86@g`d`l}uQ+zih*>Lzo20G8*~R2Y5cLz37=QCnslW&Xyb{hv)Ocl+i68v{~f| zlO+kSlFrdPNiIBh4tP>a-J{@5-RRbsKlOz+HzuE+dDRDaUIS(&mKuw^{v3a)f0Tc! zf1_XXBk!&@zrQEkj&{%qJz3CMB{BUPqxDF4*v`FpOuL%Y(GIFuDg%O%iu)+uYx5VT z7@G&e*TlKTqz3pNuvP{eGr(nRH4#a|Qgb_#U18^7u?a@h5}(Rh|ER{U2AHucG3p@3 zCNzoe(SLf8ng@KaZU2)UMXgHHsn)+MH=k;LY#-z+Kw;Qm4ycU=?Wqo%1=i418y1pb z=S#(FO-;4JmDDq=S41_Ul_y1HF~W73bSoJWm?#uD5tw1@R9v7zUE2~NybKd{DXNx9 zy=<*AX5_r6%WAvAhF$NlmxG0GO~qpgIhoLqCp%w;Ckf!Xi>!RdDZU-f>_#40Wr&{h z?+|4(?=MEg0ntoHdb-Vqu%3WszQRn+*jFf3O>?KD_zZhCo9lVNCcuc%ka4s-tnT75 zg1H4$$iariIsv&W42#bw*aGY@K)7IwNT=A%N=8d}n>RWsaiSN2QmbZ+d020b1%%yT z7oMRbd6{BVOx12WY3s_($7ql%qfZ(;DH%|Y0BQ;>AZ)D?mCf!ZSgG7pMl1owT3A9{ zW`c!h3DC(XGbZKm=oiqQgx^ia>B4~PoLnsyD6kQAX95RSuckS`f$78L(eyMMcGUBb z00sLQ@4YTHBgF_PVWI}-JV-a}#HaI}i5^hUlY&Q*^$%TUXz2P$Ad;~&Q3IFn?5Uq~ z-O4;3*!Zxn6LLs~&F;yXnzbNHvS-<|WUn{Jz{>AZGd)SPy71zaVhDg-{_D{y1a{p7 zqciY3sxt$^=?HR$85RWmJ_+074Hz=*6|uEB*oXmv#d*0Frs=p`G|QxhxPHg2)?7Ga zyJzw^G&Ix19F2)3luMF6un^{NS(r7{6*~_9zyvlMcJIjkME@7|RE$4NH@p#VWa8Vd z@4jH-n+F>{S-zx}5C5be{oOMU{!Sj9*rAK#Xi5W)Y`1_5qJ`l=jwBWMO9HgiPXqpd zpO8Lwo27S3N?I^m&B@P~uxp}b>>P%6%@Jn-$Pg||xHxUd(|lrw$Z;m-Ny#Hw^`^9= zrz4*rif=ELzN@v>b{YkCgRqyRhr1}@5is&2Tvn=!hM250+5yi&Qe1+pl#%ALV#7R0 zOk7~%=sRC22PF_pxcbawV}t{90?sZpg?>h8`rv!Ytpj3Dv~E(3sZ zkWM;D$04HQ7kf+?A=5C9<+$7Y)E{(u8nB|$y3&5Y{uyF{VVZGzZD!04*lh{?eT8pc zfrvj~STq^^DX}0aA!H<;TiFf@8?g2W>yMfq=&@Y_hpucOx>nK!U24-PEI^(H4J*1= z`VaU&!#>ultaezo&|ujYKGB??aGv(5xYH|W?gD!ViMaF&9K-paR~E4=Q>b>{T4wD_6pIk zc#Q8SU0RkvZ_XTi<%y-ve5Bo{&EY<;@~B^UAFR|4hnHFMsV?}F7`do@z9<0-HAUnl z_ppQCGAy;2s<3H@k6BY7Nk`Z&XLA@;iKTgiU#F*V<+R}TSy(5jo;*% zjo;vzjo;mwNoGK!nL(QI+>E>FWC2---{e`$Q?=l2ko*BhIids0a1`VIJfvBGGUg(8 zkPO59V&q|GR?2ML&4;XChvx-&V&#v;7xue9LCCBu)ik`HjvaqyqLj-~PBY#P#rNrW zGaor-;yDPfZ}2}TWjs&4M8FLK%l;hKF8B%P-C=iq4I(GQj8VUoW5?jn<2YT0cMHfY zoO{yDs9|)mRLgOlh8#iUW%RJpmU5g7-p)o^##crYA3moGtePg)lP9xTKta~>!d$?;}wl2Oh0z%Wm=&!tGm zxHS~`FwPlIJ@c^sa(W9b2ZYj}#k;Gl{+!lJLF3#Wcr3x2k>q^zycoFB?Wukq(XytV7ZJ7(FY!iO$4wdSsG2J z88kpMX%@|Lxh zQA5w61L+_-n4U|A&?p^BYw0jrM`N^}o<|$#`PhnM1U3-80Lynq(b4oGI);v=oFJUaFSJA8KHFO2Nmae3$=xTZ$y`J7cZ=^TTo9Qid4P8rbrMKa?4ep?K z(!21>8TZh8>3#Hmx{m&mK0qI&57A%I_4L=+D`_KbrN5yM)8EoZ=*z1`TW_XRi(p>Ygw(h)*ILI zGI1>z*NC`Qh-;;|R*7r1xDF848gU&euA=;M0k6DHypM^ifEy__o+AQ&M8J;-_z?j= zBH%{^{D^=b5%41denh~p5am{gaw|l+6{6eEyS z73I~6a)ya~!vsEcg3fw@PrdkFpLj3muNURl3;OE?KJ|kBdVxnhhhJW5w0B%Ny|{At zxN^M8tBrcCuQlokR}K$X4i8rj4_6KkR}KeP4hL5b2UlJ$uDsm(TB9Cu<#gc6@x)c+ zH|hz`BEL~Tc;@`TmE&7qYw#ae@xEHTH~3#)J3!#B8+ga64Y)C*U85WW z@0j3gOz<@(_!=|XIno(?hz$_%1_(Gt`>&4){>KK0@&x~5g8#7r2K_O?_n6>&tVWb4 z_#Uef_|^z~jeb-gs}bea82pXZ82pXZB+3=|4K?aDHdK^5RPe>qPl=qWn66f1N15PLv-L<;Mj6F;RX@lpho2$3*#}-N!_`kHrL>n1B-#aAE?EG5*!Z z679cUly8iCcrV(yG4A16z%j->JRAKhRxjYx3pn)xj_7x>`UJds%e3YtGiNPWJg>~2 zyqh(9e)C*s;<0@8{Mk!qH_vq>U(B011JADH^Xw%H<~A>#IU`v@IWHlZAaX{62v3kq zUtv5hZCN~X=8OePmrR>Ecfm4y^09f^f-7d4mM&YszG(~Qvoz*;&5JKX11NKd_gBnZ zyma>T=DCJUY$jIt5gd?@*)IVT$k^)CEZ%i_+lI zJG>YCj_2if65=8>hB_(WXZ$)m?yKfqHt#ZWEA(*mPOv+u>?&W2U1xDs>Tz$AbCKEx4FfiHdw>dkKy?wybLHD2UTAsRAasm zJZp$<6UP?i6?Luhrh1ohP`yi?rM4^Ysp~+LgzH_(U)1&LMD@7xjry?i4;;tT&HOm2 zZpP2Vx2YNqg5RanaJbc-J&ttsRh1pR)V*pRjw`WOOJDWRYN`6ZTBUxfHmF~y7pmW? zFS8Z1pYZ4B#^09iCc2s>>`wEAy{Qx{3V{lFVwMnM_*wxJjc&w~JD5n-j zUz1fkYI3S`ai9!Sg~_jctOZ$K?Og3AcCa#VE#L>rRo>Hz*}>qL&e2|G2P;$Cq#kF7 zL8~@RIi|HRxC|zT4VcQ#Y>`3rm8;r&8{x)%+sK?W%gc z;2{oH*U5X-d6I9ad+l}YWp=POpzYV*VFzmq2|9VXC|mo`IJ&iu&%u`g>_9J&dG9B@ z-`jYPPvw2Xgpq+@9QXy+C|ruaDsC02hCN_0qA{1^H?5=iP3x7=)mP*9t4F{BcpLQf zJ1`22C--3Vn1J7@K1C*@&&BcU(#hUNSD`Dd!j|z^UD)IPCOqGU;~sucsS#<=GugBB zP4d9PF~oHhz{YS6>}MC^_qZkb&+@18`|=mKdtH7<-Yk#nVs1`)NknpT+lV z^@>qb!|we=(jI|TyF+^c_t;Yd*uN)#inC%m$j;_j?9AUQW(jz&l5b#V&Cbs({a%I9 zd`wHn`7VBcmvOIQ7Le8|1Mt3>l_1rzuTmXW2vF%Uc8}dFqqyI}bG4{mq*T-^S!o=~ z7d-u3br8~&@|30gO%^XXi|4va4g&L5ekR!76jXGsM+xuovtpb(b}%T|P8a7+;3FOE zxB_YRb~G|r>Do0WkLMw-mHzef8Uu-@djU1OZFBNX1N zuOm&IL-~S1LGk_JOvFF(TMT@BbCWQkY~*3jc|`c&T_+JY=@}epFVxwLUI#7 z-^S1PFxiegz|R}_`4J{il1=;^=jUxqKqNc(`DK27eeUc_o5_BDeutkwoV#H9T=F@S zJ;_)6e3YMmSd7o)Cw|u1nF6;i`n%mr{J#4clp$sJGvgbRqPoslkAUayXU3g`G-$vw z&P-6kmNw$dM(zMSLVaP+J%`ki;X*!(B8>${lX0a1ab0IzB`?z9yL69{UiuvG@h73> zpfn18GkMRBT383}_anc=xdd{nL`r$ea@5RqPHXJiv1GxZm&&Akf=@%&7iL#kY zZAWf~QyxlZ`O{EB5z1#JWTA|)fG{3^Vc5r8kcxSl@?m{ng48SUS4dXjuQyqPzdqRa z`*y&;8-GQBF(3Q7Y$A`7C&-iV$89A~k!Q#@@*HNEmoUTZ#ti!!d7ZpL_L2kS&sd}L zKKY1zN)D4R$k*gs@^|t*IY$14T^3GYCTE_A*|57`h536mX7FX?Iz(OEg1LJw=Iwg` zjd3&xigG#rOa{P@oq>ul*+QNs&ywfK3uGtx6M2*DgIDiuto`|bd`vzge<5GOv-dar zCd7Y{AF=Q2N%#~NkvZ@;TurV-wDwKpPI4>WN~qBU&oHNegI>JL08A5L_C`H1&ildV zk*J~3;CwcCJs#f;EaIe%Y$tytFOps46|#ryCvTB=u+r#5tQh&693fwkzmlWmJMsf| zin^ad5C?n5S~ + DroidSansArabic.ttf DroidNaskh-Regular.ttf diff --git a/data/fonts/fonts.mk b/data/fonts/fonts.mk index 9dca329a69d42..6a9ed539bfc9d 100644 --- a/data/fonts/fonts.mk +++ b/data/fonts/fonts.mk @@ -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 \