From 7c99ede5759775038af229ea286eed386b87d76f Mon Sep 17 00:00:00 2001 From: sonora Date: Thu, 11 Sep 2014 22:13:37 +0200 Subject: [PATCH] fix text display --- OsmAnd/res/drawable-hdpi/list_stop_sign.png | Bin 1823 -> 1688 bytes .../res/drawable-hdpi/warnings_stop_sign.png | Bin 3619 -> 3251 bytes .../mapwidgets/RouteInfoWidgetsFactory.java | 3 ++- 3 files changed, 2 insertions(+), 1 deletion(-) diff --git a/OsmAnd/res/drawable-hdpi/list_stop_sign.png b/OsmAnd/res/drawable-hdpi/list_stop_sign.png index 7d0831dfc49b3e280c7398be31a4deca5c093e78..ebd4ebfe66aaa70d36166b48a8464b09860ad5b5 100644 GIT binary patch delta 938 zcmWN;3ozRU00-cN#5*jnr5?QmQLV9-Sy%O_wn0#DDe9GZw9Mn;x=lT+*Z}>M!jlfq@yazZ~MNx#;) zrw4s~7#P6F2s9dujbUN}Ivq?VSS)ZjFg1ml8O+ULVF4}|JRU49VQmdQA2v2Pas* zi}-km#Yjy>S{gDkkeLaI1X)?g&c?NC$jL!&F7onl{W=N@QB(w}6vf53bqg{XDk~wE zqqY|H^=N9sg9m77L2E18+VJop+S}3DiJl%jew>QlUOat@{(cM$U~mvaLl_%_Qi<_# zOiW;M5>r!{nZfKVR4UBRV_^YHOITjU$_ie;#_B58*08>gjSZ;Pc>5Ob-eG44@84s0 z7a9%r_Hb|jpnIMiNtSPtzo3lS&3kpbYjem3H6)T@4S6=arcNG5u_eg+zJjyiLjOO1 zkBXl5Wa)^5>aDzPe^u3bs7uuLgm;Oms$#HXLR4(JO+rygq+<6V-#xL}vW~x0=fD4H zee!a~1YiDZdG+N3e^0-~Ri52Zmu+F=59ujB07knnwCi~n)M$+*2an@Q4 zjZ$#vN4dt3-fl+;B{ZKT81nyEu#FLsPH$C|oD}}7oV+MveEosAJ!j^@Q&!Vjx(*Z7 z!r+dN4!6AE?9`4}TdmOk9#D(zeI7MbNHryP->@zAsp94b2raDZ`r{s)<5jMt7)fvhzPZH;+IWtSZ2MaB4=ja zm~=>A3T(Slg14 z?O$$eIxuy;GiZ^&`AKLMrf%oAH)4nH+&s(NF7H@SP(;rbKjTVfhc}Mj&8*We;4=D^ z3QBVRWay-wF;V7NGCFjjr>}F7%|8(#nQk1lI#cYtNjDG3|D3Pr%Qq}g8_#*1S=jDY zE#A1(U9dB{MoK}EzgyD151w)9GGLCuH~$REa2;%Nmd_+m>A^W#pU|8l~3|+((>C1WA@l_QTj9oAf_luRuZjIq`S@ E0TPt#qyPW_ delta 1119 zcmWN;3pf-800(f-jynoROskXg8gcnJl1Jez)wqmUQBESnI4Mpar#!CA_j%0YvYE#% zzE9`XU1bTMv-J=Qs}YT(MCUQ@^6J0+eth-v?RoB8MMWqnL0K8wwt+x^iV9R!K_r4i zf|?rC)v;p-G&G>82`w#<$aP7d<& zke`pjLX?z%&&RD>C@Vu{C90|*5a9N0R9ACx=MIEI)Yqe-0U{B^V%)oj2M^HPjMi4P zw?iVq_z`PsSYOA+1~xabwS~{00f?I9gXNX9 zdor^`&WgJ7M82FHi7ziKbx8m5tdc2LA>$~+)z9;IQSn-^ma86*)AUm5CF8^0{x`y@ z>h5DLo!(xvjl;i^?)nNVuJ1FFZZL-(MUKyB2s__Q62g-b_k3z=dA_fWPVgg4=Vkg< zu$r?f{)$tv<-4lia^+Q$Z1ax(5#<@SEy0}}Ver#TQ~bqcBhf=2ode9)6-loz_q9R; z^VOLbUmvq6G+1mAmSmN6X$37>h+V$vptn~I@wD~d1q`OBREDHx%F;7U)^z+SZSU7~ z!YMAqdTOp}4Y43sa^q%V%s;88Ua4F@MfOk&F;3{NH$)P}nOXW~?~rYPYjWYCu%$pN zBP;R2jITJR!27dh+WWe#ee>?Fdy-X>Z`W(YbCruNwl5@iD{fvTp}ZOT4@)cvW@W&5_zTMF*GM z1pNsW5^b_LE%afpb8raNN2i`j%djz9X)^F6BwUL~lF^8}@5d>7u*(|G(OJaukB(M9 zv$TsWo%j;=VWmg8VeI1ZzP$@6C-)lq?~y*b-{>BcDEpLE^FFf3PnqiY_wZ$1i#U}9ZgQh`=J51wm2^P(xpg;69I!O%;l2@&1#E#7a4^_-b7CTwfE1!SeG_w zdiQV7$nnw6Snm{s{F3oKb1q-!%y*P(>58e0L!NKzNg93nD7L77Ui^jqtRTE4wx8EU zJK-j9nb}kbjQh89qH=18Hyt`K)0td)vH8$om^qv2*tfKQd&d%`oNOm!?Jf}3Z4s*a V8u{Lrtq;ik@2H12quz~m{XZ3oUJ(EQ diff --git a/OsmAnd/res/drawable-hdpi/warnings_stop_sign.png b/OsmAnd/res/drawable-hdpi/warnings_stop_sign.png index 49944cc90af54256fb5369468d73fe4532332498..ad527966cf6b528c850426c3b06818646392a496 100644 GIT binary patch delta 2540 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 U=r6x}p@i17d)HpadV4bSe?cqS@Bjb+ diff --git a/OsmAnd/src/net/osmand/plus/views/mapwidgets/RouteInfoWidgetsFactory.java b/OsmAnd/src/net/osmand/plus/views/mapwidgets/RouteInfoWidgetsFactory.java index b366039b63..777d6ac334 100644 --- a/OsmAnd/src/net/osmand/plus/views/mapwidgets/RouteInfoWidgetsFactory.java +++ b/OsmAnd/src/net/osmand/plus/views/mapwidgets/RouteInfoWidgetsFactory.java @@ -681,6 +681,7 @@ public class RouteInfoWidgetsFactory { text = ""; } else if(alarm.getType() == AlarmInfoType.BORDER_CONTROL) { locimgId = R.drawable.warnings_border_control; + text = ""; //text = "CLO"; } else if(alarm.getType() == AlarmInfoType.TOLL_BOOTH) { text = "$"; @@ -689,8 +690,8 @@ public class RouteInfoWidgetsFactory { text = ""; } else if(alarm.getType() == AlarmInfoType.STOP) { locimgId = R.drawable.warnings_stop_sign; + text = ""; //text = "STOP"; - //text = ""; } visible = (text != null && text.length() > 0) || locimgId != 0; if (visible) {