From 60bef866471b7029125e9fef5c0e3eecf03aba2f Mon Sep 17 00:00:00 2001
From: Victor Shcherb <victor.shcherb@gmail.com>
Date: Mon, 5 Dec 2011 00:00:53 +0100
Subject: [PATCH] Apply theme changes

---
 OsmAnd/res/drawable-hdpi/box_top_trans.9.png  | Bin 0 -> 933 bytes
 .../res/drawable-hdpi/box_top_trans_l.9.png   | Bin 0 -> 910 bytes
 .../res/drawable-hdpi/box_top_trans_r.9.png   | Bin 0 -> 903 bytes
 OsmAnd/res/drawable/box_top_l.xml             |   6 ++
 OsmAnd/res/drawable/box_top_lt.xml            |   6 ++
 OsmAnd/res/drawable/box_top_r.xml             |   6 ++
 OsmAnd/res/drawable/box_top_rt.xml            |   6 ++
 OsmAnd/res/drawable/box_top_t.xml             |   6 ++
 OsmAnd/res/drawable/box_top_trans.9.png       | Bin 0 -> 933 bytes
 OsmAnd/res/drawable/box_top_trans_l.9.png     | Bin 0 -> 910 bytes
 OsmAnd/res/drawable/box_top_trans_r.9.png     | Bin 0 -> 903 bytes
 OsmAnd/res/values/strings.xml                 |   5 ++
 OsmAnd/res/xml/settings_pref.xml              |   3 +
 .../src/net/osmand/plus/OsmandSettings.java   |   9 +++
 .../osmand/plus/activities/MapActivity.java   |   1 +
 .../plus/activities/SettingsActivity.java     |   2 +-
 .../net/osmand/plus/views/MapInfoControl.java |  27 +++++++--
 .../net/osmand/plus/views/MapInfoLayer.java   |  57 +++++++++++++-----
 .../osmand/plus/views/MapStackControl.java    |  20 ++++++
 .../net/osmand/plus/views/MiniMapControl.java |   4 +-
 .../plus/views/NextTurnInfoControl.java       |   9 +--
 .../osmand/plus/views/TextInfoControl.java    |   9 +--
 22 files changed, 147 insertions(+), 29 deletions(-)
 create mode 100644 OsmAnd/res/drawable-hdpi/box_top_trans.9.png
 create mode 100644 OsmAnd/res/drawable-hdpi/box_top_trans_l.9.png
 create mode 100644 OsmAnd/res/drawable-hdpi/box_top_trans_r.9.png
 create mode 100644 OsmAnd/res/drawable/box_top_l.xml
 create mode 100644 OsmAnd/res/drawable/box_top_lt.xml
 create mode 100644 OsmAnd/res/drawable/box_top_r.xml
 create mode 100644 OsmAnd/res/drawable/box_top_rt.xml
 create mode 100644 OsmAnd/res/drawable/box_top_t.xml
 create mode 100644 OsmAnd/res/drawable/box_top_trans.9.png
 create mode 100644 OsmAnd/res/drawable/box_top_trans_l.9.png
 create mode 100644 OsmAnd/res/drawable/box_top_trans_r.9.png

diff --git a/OsmAnd/res/drawable-hdpi/box_top_trans.9.png b/OsmAnd/res/drawable-hdpi/box_top_trans.9.png
new file mode 100644
index 0000000000000000000000000000000000000000..a65d362488cbabaa8b4a7d448613761953d4c777
GIT binary patch
literal 933
zcmV;W16urvP)<h;3K|Lk000e1NJLTq001fg000&U1^@s6wtEhZ000AQNkl<Zc-rlj
z-Aj{E9LLqY^lXc{u*9~RWy#Xi5=v;LwIU14-chsYjmk8`O?x$Msne{)m+2N0CKh8k
zy-@JRYySi96#oT9RPe%^^*!(%tPpWiyU7C|cAm3yp7TAw-}m`FPfX0#v|!A?YC}Uq
z)e42;8M+1FC@_L}umi+_ShC(0nlIKWfEMUMCa{3}E|=>=v_i|#y-1<SKu4jn4GLBA
z&;|-U4<1G(G!O{bAhZJAOCSfNfL%bM&`6>hE>gzB#xqOV-~xEu+uK_ovCzT6!5RpC
ziS89}92@|<feOgE>3YS6=E%5K;-OO*1QCp<h-gE^Lj8V!Eri<8y$()-G>`~(GIjF5
zED*bfz;Kabt(u2U1-T4HC4|}|7V7i)-pJ+hcj%UYGxU;ykx(;z3JQ>|65+V8RLeM5
z$&84!?*%4s8r%Xlr_<TERux&bl#GmwSk-EElQ20`Bhr76Q573$m_j8{Fk;~-!URe@
zpm^H%&`LS<=RHvGcDoxRE_c(@(<OSnz8&2va2w=<Ecz;u6+lbDDk3q`5($lKI9ErJ
z`#=UbMQc^4RI0YIv9aoig|4iu<XS8iH@d>$Pry~)IFr#ZP;dh6pkt)N(eb|o&ed~m
z27O=1jJ-FROs=`Pxq^s=&d<;5;M0%jI>Br302F~drYxOS*v}ekq<B3sa4eZ~#N5N+
z7!O>?l#2(p-Db0O1cSlUsNQt5v$N;SX0sRFub>t@0ypR@vDpcV&Ss=D!Z<>*DNcCY
z%;J7cyorDnv?e7b^-oPr6+>uTR6?;(IWaL&r`2i)aQO|0D)1cK1vkNEzGB7ZXGuN@
zU0ZmtLi+IzC})=1luBj4*XwP<UfK<PJKzS!zP`RjnB7MkG;xy`^scZ(87O5bD<&lr
zRmSLvxs}Y!C(wyH?Q3psZeLhfNZXVTl;!1R<M{Y^Lwb680GB^OkB9~k<wU%n--1^Z
zQA27uCjP6VxX+*)3>XZCfXCx;K;)s#{cZ~erJ0$TBD>w*k(HG-tkGzGQMB-IANUSL
zm2eR^$2^?#Ly{yvp6+3*)!I8bIa!K(#&6l@-_p`j;^N|B9wJ=T)z#J3+S=OF($eC@
zZ@0tY_yaK}{sXSg&dx8RqoX$QfQk&oY`5+9AGhEZv99(TNF@#rzZH7900000NkvXX
Hu0mjf1K-3w

literal 0
HcmV?d00001

diff --git a/OsmAnd/res/drawable-hdpi/box_top_trans_l.9.png b/OsmAnd/res/drawable-hdpi/box_top_trans_l.9.png
new file mode 100644
index 0000000000000000000000000000000000000000..333a5cfa08d3f477eb8a761f400dddb7b7ba4b9a
GIT binary patch
literal 910
zcmV;919AL`P)<h;3K|Lk000e1NJLTq001fg000&U1^@s6wtEhZ00001b5ch_0Itp)
z=>Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2ipt;
z5i<t<Q#Dus00Rz5L_t(Y$L&^4OB+!XJ#W4;GfA9$7!gcjL!kpwbkR)-Qs|-u#ia|O
zt01k*;1AH9;KHr@(z<ftw(f)=S#{G@#0J}ipoJ`I(o8fT^SZeMufrsDEN!9m!efSz
zd*8X|oOkB|zb82URP68XmsM4L1>iY=IRIGz7Jvu<2>_!NHvBm<)x+-Y?$9LZ7Dd^R
z_g`U~1?(XKcrq+W8Cs2VNnlP2V37%%@(^tLbNa%bmC%fG&KWhL2=d57m<`LY8(^Jr
z#+VtJQP*`vpej8*umeFx?qe&gU%i~hsD`BxKxNK(gbt5JPgMXd3ziTq!h9>}H%9p`
zfIMv(84L!Gh6$_$m>U2PjYhkgrltD*z5&1hpwsFJ(hY=M9>Az*4X+`EnvMZT02rr3
zbWc$f6~Oyp(g)H#Gc$9MNF=h3<HV?_1K>t5KND==`oQ|VD+vmy)VKk_1P}!fHw+_|
z%jGUYOJ67yKH0Wy0!UKl2>@dN;#52;u&fhH5#M{n_aBp*j?qlEyxRGEK3*&qYoQNQ
zyWKurU0uCAIy%Y#xF*TDz{)j%E-^X~*yO(X=rJ!-o=#0#08&ImdU0{_CY4InLjz4F
zlV2N+#&NM&d{M1dGbFF)F`cZ?B`bLHy8-@`g*=TUj|o6ClarIFwY9ZF0G~qx1%Pxq
zeZ0NB{dj3<=|QvEWW-2>B<zr9djhKvz)AvOZ^U^($7rQBO`F)-+B&yw`;al_-U%pU
ztjjrnv$M1FvRp3T?{qpI$d+)pdcq{|OD_pPH34WGfTgNxW@BUHa(Q|AEn}=X63T6+
zvg0_}N~Ka-UtfP%tJQ7*TmfhkP*MIMk9z*p1U0OwsVQS~bMxcM%F1iYvg%=PG8pkm
z)$8^8v%S5&rw0cIxwEsge!Jc7`J@j5>iJXAbzPmFo>mtY7QU29rQ_Mz*>{YwtGise
zej2S-Yl3rbSF6>zlarII<2X^yIcJP<*Zt9Ak|cR|2H7;tZ-qkPa(;gPgK3(lrfHtz
kfBcVsD8d{j{x>mv2lu$}&P!n|P5=M^07*qoM6N<$g2jxH1ONa4

literal 0
HcmV?d00001

diff --git a/OsmAnd/res/drawable-hdpi/box_top_trans_r.9.png b/OsmAnd/res/drawable-hdpi/box_top_trans_r.9.png
new file mode 100644
index 0000000000000000000000000000000000000000..14991013c58f138c92e244a5aa2166309e1ca9bd
GIT binary patch
literal 903
zcmV;219<$2P)<h;3K|Lk000e1NJLTq001fg000&U1^@s6wtEhZ00001b5ch_0Itp)
z=>Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2ipt;
z5i%Ez_$2E900Rd}L_t(Y$L*FsNE=Zc$3O3KcS$a4{t=P-k5Fhp#I6!t96BhD4nm<I
zQXIv(=q5P0x|i0;!L@FJNa)&0vB7o_v>>!5&G|36*X12Nk6db$wov@Rmjqt&_`L7$
z`@47WXG-$7YIAcF%d!AWzz8ghz~@~`C>ekSbOBF*VPG71wZ6XoChX5fi;YLs#-5VU
zBp>LUzL(F@iY0teO8HTNcmelhh`YZ7YX&GZNJB~~?gI*70}c?;0L23mB?1wM=n_JN
z?rnxGc%Bypu7GQ;-NDx1)k)tJ-9aDFQXEz*<642{q?8q)qQFe$?u`}+J-=Saposve
z59iAUqCm9KXoP`EQ*-K8B@&5g+qN_Hdi@AE1<ru)Kvg+i2O1inY>{8xNmIea)WPFQ
z3DXSq4KplrLqkI+sZ^@Zb=?l218_A!G<TZ8HghwgJ(_$t2S@;&@p!zWzrX*a?P1F2
z^Ir;uf&-+1lu{SasWwk2SA0d4^zYHYZya^#4j`$N0#XA51D(ZUalh@1)@rrGxw*O1
zot>Q=aH(a}cjZzIT0=<&+OJQzJ~%OT$Rv<aMr0=^C$BP@Ou22)bUOXx?Cfl>SS-FQ
zl}b6)UO!_o6@}|SR=p<qj0Cb7*Bs3Nxt^Y$%>4ZPHt@A=P=IVUySKW!IyyBq^{i5<
z2<1prweUh^_C|9R4c5?rO>M&CDneaA*0$~Lm6es_LZPrNgz)YKDulR}QodVTTYJ5*
zu<-Qa;=+flYQuG-<TYu%p@G^OXeW@gEGxIPv~)T>J^fw?QE7>Cm#4Ptx_!I5yR(an
zi^Kc-`&Ym@P}44idLXAX$)~M#BiY;A8(&^t{yZ}?^ER1GmfN{GTEDkR87r5|FE%zd
z#<#Y%`j3u|>a|+!CeZq3png8hSS)4@4h~uq6BFNNXJ_|DMn*meA<o;q;_g({YPDNR
zStylC&kqg``drsdNGYWdLVDiqh#7`~deMkDj`K60&!3KsjeT+)=g@JSV;<|V{-bJV
dnB>1?_yt{D`tTVhE&l)j002ovPDHLkV1mC#oyq_J

literal 0
HcmV?d00001

diff --git a/OsmAnd/res/drawable/box_top_l.xml b/OsmAnd/res/drawable/box_top_l.xml
new file mode 100644
index 0000000000..82e888e3fd
--- /dev/null
+++ b/OsmAnd/res/drawable/box_top_l.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_pressed="true" android:drawable="@drawable/box_top_pressed" />
+    <item android:state_focused="true" android:drawable="@drawable/box_top_pressed" />
+    <item android:drawable="@drawable/box_top_simple" />
+</selector>
diff --git a/OsmAnd/res/drawable/box_top_lt.xml b/OsmAnd/res/drawable/box_top_lt.xml
new file mode 100644
index 0000000000..4870fe6ad0
--- /dev/null
+++ b/OsmAnd/res/drawable/box_top_lt.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_pressed="true" android:drawable="@drawable/box_top_pressed" />
+    <item android:state_focused="true" android:drawable="@drawable/box_top_pressed" />
+    <item android:drawable="@drawable/box_top_trans_l" />
+</selector>
diff --git a/OsmAnd/res/drawable/box_top_r.xml b/OsmAnd/res/drawable/box_top_r.xml
new file mode 100644
index 0000000000..82e888e3fd
--- /dev/null
+++ b/OsmAnd/res/drawable/box_top_r.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_pressed="true" android:drawable="@drawable/box_top_pressed" />
+    <item android:state_focused="true" android:drawable="@drawable/box_top_pressed" />
+    <item android:drawable="@drawable/box_top_simple" />
+</selector>
diff --git a/OsmAnd/res/drawable/box_top_rt.xml b/OsmAnd/res/drawable/box_top_rt.xml
new file mode 100644
index 0000000000..c3d84c8a26
--- /dev/null
+++ b/OsmAnd/res/drawable/box_top_rt.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_pressed="true" android:drawable="@drawable/box_top_pressed" />
+    <item android:state_focused="true" android:drawable="@drawable/box_top_pressed" />
+    <item android:drawable="@drawable/box_top_trans_r" />
+</selector>
diff --git a/OsmAnd/res/drawable/box_top_t.xml b/OsmAnd/res/drawable/box_top_t.xml
new file mode 100644
index 0000000000..b0416444cc
--- /dev/null
+++ b/OsmAnd/res/drawable/box_top_t.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_pressed="true" android:drawable="@drawable/box_top_pressed" />
+    <item android:state_focused="true" android:drawable="@drawable/box_top_pressed" />
+    <item android:drawable="@drawable/box_top_trans" />
+</selector>
diff --git a/OsmAnd/res/drawable/box_top_trans.9.png b/OsmAnd/res/drawable/box_top_trans.9.png
new file mode 100644
index 0000000000000000000000000000000000000000..a65d362488cbabaa8b4a7d448613761953d4c777
GIT binary patch
literal 933
zcmV;W16urvP)<h;3K|Lk000e1NJLTq001fg000&U1^@s6wtEhZ000AQNkl<Zc-rlj
z-Aj{E9LLqY^lXc{u*9~RWy#Xi5=v;LwIU14-chsYjmk8`O?x$Msne{)m+2N0CKh8k
zy-@JRYySi96#oT9RPe%^^*!(%tPpWiyU7C|cAm3yp7TAw-}m`FPfX0#v|!A?YC}Uq
z)e42;8M+1FC@_L}umi+_ShC(0nlIKWfEMUMCa{3}E|=>=v_i|#y-1<SKu4jn4GLBA
z&;|-U4<1G(G!O{bAhZJAOCSfNfL%bM&`6>hE>gzB#xqOV-~xEu+uK_ovCzT6!5RpC
ziS89}92@|<feOgE>3YS6=E%5K;-OO*1QCp<h-gE^Lj8V!Eri<8y$()-G>`~(GIjF5
zED*bfz;Kabt(u2U1-T4HC4|}|7V7i)-pJ+hcj%UYGxU;ykx(;z3JQ>|65+V8RLeM5
z$&84!?*%4s8r%Xlr_<TERux&bl#GmwSk-EElQ20`Bhr76Q573$m_j8{Fk;~-!URe@
zpm^H%&`LS<=RHvGcDoxRE_c(@(<OSnz8&2va2w=<Ecz;u6+lbDDk3q`5($lKI9ErJ
z`#=UbMQc^4RI0YIv9aoig|4iu<XS8iH@d>$Pry~)IFr#ZP;dh6pkt)N(eb|o&ed~m
z27O=1jJ-FROs=`Pxq^s=&d<;5;M0%jI>Br302F~drYxOS*v}ekq<B3sa4eZ~#N5N+
z7!O>?l#2(p-Db0O1cSlUsNQt5v$N;SX0sRFub>t@0ypR@vDpcV&Ss=D!Z<>*DNcCY
z%;J7cyorDnv?e7b^-oPr6+>uTR6?;(IWaL&r`2i)aQO|0D)1cK1vkNEzGB7ZXGuN@
zU0ZmtLi+IzC})=1luBj4*XwP<UfK<PJKzS!zP`RjnB7MkG;xy`^scZ(87O5bD<&lr
zRmSLvxs}Y!C(wyH?Q3psZeLhfNZXVTl;!1R<M{Y^Lwb680GB^OkB9~k<wU%n--1^Z
zQA27uCjP6VxX+*)3>XZCfXCx;K;)s#{cZ~erJ0$TBD>w*k(HG-tkGzGQMB-IANUSL
zm2eR^$2^?#Ly{yvp6+3*)!I8bIa!K(#&6l@-_p`j;^N|B9wJ=T)z#J3+S=OF($eC@
zZ@0tY_yaK}{sXSg&dx8RqoX$QfQk&oY`5+9AGhEZv99(TNF@#rzZH7900000NkvXX
Hu0mjf1K-3w

literal 0
HcmV?d00001

diff --git a/OsmAnd/res/drawable/box_top_trans_l.9.png b/OsmAnd/res/drawable/box_top_trans_l.9.png
new file mode 100644
index 0000000000000000000000000000000000000000..333a5cfa08d3f477eb8a761f400dddb7b7ba4b9a
GIT binary patch
literal 910
zcmV;919AL`P)<h;3K|Lk000e1NJLTq001fg000&U1^@s6wtEhZ00001b5ch_0Itp)
z=>Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2ipt;
z5i<t<Q#Dus00Rz5L_t(Y$L&^4OB+!XJ#W4;GfA9$7!gcjL!kpwbkR)-Qs|-u#ia|O
zt01k*;1AH9;KHr@(z<ftw(f)=S#{G@#0J}ipoJ`I(o8fT^SZeMufrsDEN!9m!efSz
zd*8X|oOkB|zb82URP68XmsM4L1>iY=IRIGz7Jvu<2>_!NHvBm<)x+-Y?$9LZ7Dd^R
z_g`U~1?(XKcrq+W8Cs2VNnlP2V37%%@(^tLbNa%bmC%fG&KWhL2=d57m<`LY8(^Jr
z#+VtJQP*`vpej8*umeFx?qe&gU%i~hsD`BxKxNK(gbt5JPgMXd3ziTq!h9>}H%9p`
zfIMv(84L!Gh6$_$m>U2PjYhkgrltD*z5&1hpwsFJ(hY=M9>Az*4X+`EnvMZT02rr3
zbWc$f6~Oyp(g)H#Gc$9MNF=h3<HV?_1K>t5KND==`oQ|VD+vmy)VKk_1P}!fHw+_|
z%jGUYOJ67yKH0Wy0!UKl2>@dN;#52;u&fhH5#M{n_aBp*j?qlEyxRGEK3*&qYoQNQ
zyWKurU0uCAIy%Y#xF*TDz{)j%E-^X~*yO(X=rJ!-o=#0#08&ImdU0{_CY4InLjz4F
zlV2N+#&NM&d{M1dGbFF)F`cZ?B`bLHy8-@`g*=TUj|o6ClarIFwY9ZF0G~qx1%Pxq
zeZ0NB{dj3<=|QvEWW-2>B<zr9djhKvz)AvOZ^U^($7rQBO`F)-+B&yw`;al_-U%pU
ztjjrnv$M1FvRp3T?{qpI$d+)pdcq{|OD_pPH34WGfTgNxW@BUHa(Q|AEn}=X63T6+
zvg0_}N~Ka-UtfP%tJQ7*TmfhkP*MIMk9z*p1U0OwsVQS~bMxcM%F1iYvg%=PG8pkm
z)$8^8v%S5&rw0cIxwEsge!Jc7`J@j5>iJXAbzPmFo>mtY7QU29rQ_Mz*>{YwtGise
zej2S-Yl3rbSF6>zlarII<2X^yIcJP<*Zt9Ak|cR|2H7;tZ-qkPa(;gPgK3(lrfHtz
kfBcVsD8d{j{x>mv2lu$}&P!n|P5=M^07*qoM6N<$g2jxH1ONa4

literal 0
HcmV?d00001

diff --git a/OsmAnd/res/drawable/box_top_trans_r.9.png b/OsmAnd/res/drawable/box_top_trans_r.9.png
new file mode 100644
index 0000000000000000000000000000000000000000..14991013c58f138c92e244a5aa2166309e1ca9bd
GIT binary patch
literal 903
zcmV;219<$2P)<h;3K|Lk000e1NJLTq001fg000&U1^@s6wtEhZ00001b5ch_0Itp)
z=>Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2ipt;
z5i%Ez_$2E900Rd}L_t(Y$L*FsNE=Zc$3O3KcS$a4{t=P-k5Fhp#I6!t96BhD4nm<I
zQXIv(=q5P0x|i0;!L@FJNa)&0vB7o_v>>!5&G|36*X12Nk6db$wov@Rmjqt&_`L7$
z`@47WXG-$7YIAcF%d!AWzz8ghz~@~`C>ekSbOBF*VPG71wZ6XoChX5fi;YLs#-5VU
zBp>LUzL(F@iY0teO8HTNcmelhh`YZ7YX&GZNJB~~?gI*70}c?;0L23mB?1wM=n_JN
z?rnxGc%Bypu7GQ;-NDx1)k)tJ-9aDFQXEz*<642{q?8q)qQFe$?u`}+J-=Saposve
z59iAUqCm9KXoP`EQ*-K8B@&5g+qN_Hdi@AE1<ru)Kvg+i2O1inY>{8xNmIea)WPFQ
z3DXSq4KplrLqkI+sZ^@Zb=?l218_A!G<TZ8HghwgJ(_$t2S@;&@p!zWzrX*a?P1F2
z^Ir;uf&-+1lu{SasWwk2SA0d4^zYHYZya^#4j`$N0#XA51D(ZUalh@1)@rrGxw*O1
zot>Q=aH(a}cjZzIT0=<&+OJQzJ~%OT$Rv<aMr0=^C$BP@Ou22)bUOXx?Cfl>SS-FQ
zl}b6)UO!_o6@}|SR=p<qj0Cb7*Bs3Nxt^Y$%>4ZPHt@A=P=IVUySKW!IyyBq^{i5<
z2<1prweUh^_C|9R4c5?rO>M&CDneaA*0$~Lm6es_LZPrNgz)YKDulR}QodVTTYJ5*
zu<-Qa;=+flYQuG-<TYu%p@G^OXeW@gEGxIPv~)T>J^fw?QE7>Cm#4Ptx_!I5yR(an
zi^Kc-`&Ym@P}44idLXAX$)~M#BiY;A8(&^t{yZ}?^ER1GmfN{GTEDkR87r5|FE%zd
z#<#Y%`j3u|>a|+!CeZq3png8hSS)4@4h~uq6BFNNXJ_|DMn*meA<o;q;_g({YPDNR
zStylC&kqg``drsdNGYWdLVDiqh#7`~deMkDj`K60&!3KsjeT+)=g@JSV;<|V{-bJV
dnB>1?_yt{D`tTVhE&l)j002ovPDHLkV1mC#oyq_J

literal 0
HcmV?d00001

diff --git a/OsmAnd/res/values/strings.xml b/OsmAnd/res/values/strings.xml
index 4240f2df80..8154722195 100644
--- a/OsmAnd/res/values/strings.xml
+++ b/OsmAnd/res/values/strings.xml
@@ -1,5 +1,10 @@
 <?xml version="1.0" encoding="utf-8" standalone="no"?>
 <resources>
+	<string name="use_transparent_map_theme_descr">Use transparent map controls (requires application restart)</string>
+	<string name="use_transparent_map_theme">Transparent theme</string>
+	
+	<string name="appearance_settings_descr">Configure application look and feel</string>
+	<string name="appearance_settings">Appearance</string>
 	<string name="native_library_not_supported">Native library is not supported on this device.</string>
 	<string name="init_native_library">Initializing native library...</string>
 	<string name="choose_auto_follow_route">Map view auto follow</string>
diff --git a/OsmAnd/res/xml/settings_pref.xml b/OsmAnd/res/xml/settings_pref.xml
index f28cc257c8..ae95fb48b0 100644
--- a/OsmAnd/res/xml/settings_pref.xml
+++ b/OsmAnd/res/xml/settings_pref.xml
@@ -87,6 +87,9 @@
 		<EditTextPreference android:title="@string/application_dir" android:key="external_storage_dir"></EditTextPreference>
 	</PreferenceScreen>
 	
+	<PreferenceScreen android:key="appearance_settings" android:title="@string/appearance_settings" android:summary="@string/appearance_settings_descr">
+		<CheckBoxPreference android:key="transparent_map_theme" android:title="@string/use_transparent_map_theme" android:summary="@string/use_transparent_map_theme_descr"></CheckBoxPreference>
+	</PreferenceScreen>
 
 	<PreferenceScreen android:key = "osm_settings" android:title="@string/osm_settings" android:summary="@string/osm_settings_descr">
 		<!--
diff --git a/OsmAnd/src/net/osmand/plus/OsmandSettings.java b/OsmAnd/src/net/osmand/plus/OsmandSettings.java
index a88fc79a9e..1997f2a97c 100644
--- a/OsmAnd/src/net/osmand/plus/OsmandSettings.java
+++ b/OsmAnd/src/net/osmand/plus/OsmandSettings.java
@@ -1050,6 +1050,15 @@ public class OsmandSettings {
 	public final OsmandPreference<Boolean> SHOW_ARRIVAL_TIME_OTHERWISE_EXPECTED_TIME = 
 		new BooleanPreference("show_arrival_time", true, true);
 	
+	// UI boxes
+	public final CommonPreference<Boolean> TRANSPARENT_MAP_THEME = 
+			new BooleanPreference("transparent_map_theme", true, true);
+	{
+		TRANSPARENT_MAP_THEME.setModeDefaultValue(ApplicationMode.CAR, false);
+		TRANSPARENT_MAP_THEME.setModeDefaultValue(ApplicationMode.BICYCLE, false);
+		TRANSPARENT_MAP_THEME.setModeDefaultValue(ApplicationMode.PEDESTRIAN, true);
+	}
+	
 	public enum DayNightMode {
 		AUTO(R.string.daynight_mode_auto), 
 		DAY(R.string.daynight_mode_day), 
diff --git a/OsmAnd/src/net/osmand/plus/activities/MapActivity.java b/OsmAnd/src/net/osmand/plus/activities/MapActivity.java
index f5a5fbda57..5d5c24ddf1 100644
--- a/OsmAnd/src/net/osmand/plus/activities/MapActivity.java
+++ b/OsmAnd/src/net/osmand/plus/activities/MapActivity.java
@@ -885,6 +885,7 @@ public class MapActivity extends Activity implements IMapLocationListener, Senso
 		routingHelper.setAppMode(settings.getApplicationMode());
 		mapView.setMapPosition(settings.POSITION_ON_MAP.get());
 		registerUnregisterSensor(getLastKnownLocation());
+		mapLayers.getMapInfoLayer().applyTheme();
 		mapLayers.updateLayers(mapView);
 	}
 	
diff --git a/OsmAnd/src/net/osmand/plus/activities/SettingsActivity.java b/OsmAnd/src/net/osmand/plus/activities/SettingsActivity.java
index 7f7e56dc2f..68b13d776e 100644
--- a/OsmAnd/src/net/osmand/plus/activities/SettingsActivity.java
+++ b/OsmAnd/src/net/osmand/plus/activities/SettingsActivity.java
@@ -174,10 +174,10 @@ public class SettingsActivity extends PreferenceActivity implements OnPreference
 	    registerBooleanPreference(osmandSettings.USE_OSMAND_ROUTING_SERVICE_ALWAYS,screen); 
 	    registerBooleanPreference(osmandSettings.USE_INTERNET_TO_DOWNLOAD_TILES,screen);
 	    registerBooleanPreference(osmandSettings.MAP_VECTOR_DATA,screen);
+	    registerBooleanPreference(osmandSettings.TRANSPARENT_MAP_THEME,screen);
 	    registerBooleanPreference(osmandSettings.TEST_ANIMATE_ROUTING,screen);
 	    registerBooleanPreference(osmandSettings.NATIVE_RENDERING,screen);
 	    
-	    
 		registerEditTextPreference(osmandSettings.USER_NAME, screen);
 		registerEditTextPreference(osmandSettings.USER_PASSWORD, screen);
 		
diff --git a/OsmAnd/src/net/osmand/plus/views/MapInfoControl.java b/OsmAnd/src/net/osmand/plus/views/MapInfoControl.java
index 89271708e0..6a04627385 100644
--- a/OsmAnd/src/net/osmand/plus/views/MapInfoControl.java
+++ b/OsmAnd/src/net/osmand/plus/views/MapInfoControl.java
@@ -2,7 +2,10 @@ package net.osmand.plus.views;
 
 import android.content.Context;
 import android.graphics.Canvas;
+import android.graphics.Color;
+import android.graphics.Paint;
 import android.graphics.Rect;
+import android.graphics.Paint.Style;
 import android.graphics.drawable.Drawable;
 import android.view.View;
 
@@ -11,11 +14,14 @@ public abstract class MapInfoControl extends View {
 	int height = 0;
 	Rect padding = new Rect();
 
-	public MapInfoControl(Context ctx, int background) {
+	public MapInfoControl(Context ctx) {
 		super(ctx);
-		Drawable drawable = ctx.getResources().getDrawable(background).mutate();
-		drawable.getPadding(padding);
-		setBackgroundDrawable(drawable);
+	}
+	
+	@Override
+	public void setBackgroundDrawable(Drawable d) {
+		d.getPadding(padding);
+		super.setBackgroundDrawable(d);
 	}
 
 	
@@ -41,6 +47,19 @@ public abstract class MapInfoControl extends View {
 
 	}
 	
+	protected void drawShadowText(Canvas cv, String text, float centerX, float centerY, Paint textPaint) {
+		int c = textPaint.getColor();
+		textPaint.setStyle(Style.STROKE);
+		textPaint.setColor(Color.LTGRAY);
+		textPaint.setStrokeWidth(4);
+		cv.drawText(text, centerX, centerY, textPaint);
+		// reset
+		textPaint.setStrokeWidth(1);
+		textPaint.setStyle(Style.FILL);
+		textPaint.setColor(c);
+		cv.drawText(text, centerX, centerY, textPaint);
+	}
+	
 	@Override
 	protected void onDraw(Canvas canvas) {
 		super.onDraw(canvas);
diff --git a/OsmAnd/src/net/osmand/plus/views/MapInfoLayer.java b/OsmAnd/src/net/osmand/plus/views/MapInfoLayer.java
index 2d91a5f1cf..96a6d970bc 100644
--- a/OsmAnd/src/net/osmand/plus/views/MapInfoLayer.java
+++ b/OsmAnd/src/net/osmand/plus/views/MapInfoLayer.java
@@ -84,7 +84,7 @@ public class MapInfoLayer extends OsmandMapLayer {
 		paintSubText.setStyle(Style.FILL_AND_STROKE);
 		paintSubText.setColor(Color.BLACK);
 		paintSubText.setTextSize(15 * scaleCoefficient);
-		paintSubText.setFakeBoldText(true);
+		
 		paintSubText.setAntiAlias(true);
 		
 		paintImg = new Paint();
@@ -93,14 +93,39 @@ public class MapInfoLayer extends OsmandMapLayer {
 		paintImg.setAntiAlias(true);
 		
 		createTopBarElements();
+		
+		applyTheme();
 	}
 	
+	public void applyTheme() {
+		int boxTop = R.drawable.box_top;
+		int boxTopR = R.drawable.box_top_r;
+		int boxTopL = R.drawable.box_top_l;
+		int expand = R.drawable.box_expand;
+		if(view.getSettings().TRANSPARENT_MAP_THEME.get()){
+			boxTop = R.drawable.box_top_t;
+			boxTopR = R.drawable.box_top_rt;
+			boxTopL = R.drawable.box_top_lt;
+		}
+		int i = 0;
+		for(MapInfoControl m : rightStack.getAllViews()){
+			m.setBackgroundDrawable(view.getResources().getDrawable(i == 0 ? boxTopR : boxTop).mutate());
+			i++;
+		}
+		rightStack.setExpandImageDrawable(view.getResources().getDrawable(expand).mutate());
+		i = 0;
+		for(MapInfoControl m : leftStack.getAllViews()){
+			m.setBackgroundDrawable(view.getResources().getDrawable(i < 2 ? boxTopL : boxTop).mutate());
+			i++;
+		}
+		leftStack.setExpandImageDrawable(view.getResources().getDrawable(expand).mutate());
+		statusBar.setBackgroundDrawable(view.getResources().getDrawable(boxTop).mutate());
+	}
 	
 	public void createTopBarElements() {
 		// 1. Create view groups and controls
 		statusBar = createStatusBar();
-		Rect topRectPadding = new Rect();
-		view.getResources().getDrawable(R.drawable.box_top).getPadding(topRectPadding);
+		statusBar.setBackgroundDrawable(view.getResources().getDrawable(R.drawable.box_top).mutate());
 		
 		rightStack = new MapStackControl(view.getContext());
 		rightStack.addStackView(createDistanceControl());
@@ -112,12 +137,13 @@ public class MapInfoLayer extends OsmandMapLayer {
 		leftStack.addStackView(createMiniMapControl());
 		
 		// 2. Preparations
+		Rect topRectPadding = new Rect();
+		view.getResources().getDrawable(R.drawable.box_top).getPadding(topRectPadding);
+		
 		STATUS_BAR_MARGIN_X = (int) (STATUS_BAR_MARGIN_X * scaleCoefficient);
 		statusBar.measure(MeasureSpec.UNSPECIFIED, MeasureSpec.UNSPECIFIED);
 		Rect statusBarPadding = new Rect();
 		statusBar.getBackground().getPadding(statusBarPadding);
-		
-
 		// 3. put into frame parent layout controls
 		FrameLayout parent = (FrameLayout) view.getParent();
 		// status bar hides own top part 
@@ -129,21 +155,25 @@ public class MapInfoLayer extends OsmandMapLayer {
 				android.view.ViewGroup.LayoutParams.WRAP_CONTENT, Gravity.RIGHT);
 		flp.rightMargin = STATUS_BAR_MARGIN_X;
 		flp.topMargin = topMargin;
-		parent.addView(rightStack, flp);
+		rightStack.setLayoutParams(flp);
+		
 		
 		flp = new FrameLayout.LayoutParams(android.view.ViewGroup.LayoutParams.FILL_PARENT,
 				android.view.ViewGroup.LayoutParams.WRAP_CONTENT, Gravity.LEFT);
 		flp.leftMargin = STATUS_BAR_MARGIN_X;
 		flp.topMargin = topMargin;
-		parent.addView(leftStack, flp);
+		leftStack.setLayoutParams(flp);
 
 		flp = new FrameLayout.LayoutParams(android.view.ViewGroup.LayoutParams.FILL_PARENT,
 				android.view.ViewGroup.LayoutParams.WRAP_CONTENT, Gravity.TOP);
 		flp.leftMargin = STATUS_BAR_MARGIN_X;
 		flp.rightMargin = STATUS_BAR_MARGIN_X;
 		flp.topMargin = -topRectPadding.top;
+		statusBar.setLayoutParams(flp);
 
-		parent.addView(statusBar, flp);
+		parent.addView(rightStack);
+		parent.addView(leftStack);
+		parent.addView(statusBar);
 	}
 
 	
@@ -184,7 +214,7 @@ public class MapInfoLayer extends OsmandMapLayer {
 	}
 
 	private TextInfoControl createSpeedControl(){
-		final TextInfoControl speedControl = new TextInfoControl(map, R.drawable.box_top, 0, paintText, paintSubText) {
+		final TextInfoControl speedControl = new TextInfoControl(map, 0, paintText, paintSubText) {
 			private float cachedSpeed = 0;
 
 			@Override
@@ -218,7 +248,7 @@ public class MapInfoLayer extends OsmandMapLayer {
 		final Drawable time = view.getResources().getDrawable(R.drawable.info_time);
 		final Drawable timeToGo = view.getResources().getDrawable(R.drawable.info_time_to_go);
 		showArrivalTime = view.getSettings().SHOW_ARRIVAL_TIME_OTHERWISE_EXPECTED_TIME.get();
-		final TextInfoControl leftTimeControl = new TextInfoControl(map, R.drawable.box_top, 0, paintText, paintSubText) {
+		final TextInfoControl leftTimeControl = new TextInfoControl(map, 0, paintText, paintSubText) {
 			private long cachedLeftTime = 0;
 			
 			@Override
@@ -275,7 +305,7 @@ public class MapInfoLayer extends OsmandMapLayer {
 	}
 	
 	private TextInfoControl createDistanceControl() {
-		TextInfoControl distanceControl = new TextInfoControl(map, R.drawable.box_top, 0, paintText, paintSubText) {
+		TextInfoControl distanceControl = new TextInfoControl(map, 0, paintText, paintSubText) {
 			private float[] calculations = new float[1];
 			private int cachedMeters = 0;
 			
@@ -332,7 +362,7 @@ public class MapInfoLayer extends OsmandMapLayer {
 	}
 		
 	private MiniMapControl createMiniMapControl() {
-		MiniMapControl miniMapControl = new MiniMapControl(map, view, R.drawable.box_top) {
+		MiniMapControl miniMapControl = new MiniMapControl(map, view) {
 			@Override
 			public boolean updateInfo() {
 				boolean visible = false;
@@ -358,7 +388,7 @@ public class MapInfoLayer extends OsmandMapLayer {
 	}
 	
 	private NextTurnInfoControl createNextInfoControl() {
-		NextTurnInfoControl nextTurnInfo = new NextTurnInfoControl(map, R.drawable.box_top, paintText, paintSubText) {
+		NextTurnInfoControl nextTurnInfo = new NextTurnInfoControl(map, paintText, paintSubText) {
 			
 			@Override
 			public boolean updateInfo() {
@@ -407,7 +437,6 @@ public class MapInfoLayer extends OsmandMapLayer {
 	
 	private ViewGroup createStatusBar() {
 		LinearLayout statusBar = new LinearLayout(view.getContext());
-		statusBar.setBackgroundDrawable(view.getResources().getDrawable(R.drawable.box_top).mutate());
 		statusBar.setOrientation(LinearLayout.HORIZONTAL);
 		
 		// Compass icon
diff --git a/OsmAnd/src/net/osmand/plus/views/MapStackControl.java b/OsmAnd/src/net/osmand/plus/views/MapStackControl.java
index 0726fe2be2..47c4227da4 100644
--- a/OsmAnd/src/net/osmand/plus/views/MapStackControl.java
+++ b/OsmAnd/src/net/osmand/plus/views/MapStackControl.java
@@ -9,6 +9,7 @@ import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
 import android.graphics.Canvas;
 import android.graphics.Paint;
+import android.graphics.drawable.Drawable;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.ImageView;
@@ -52,6 +53,10 @@ public class MapStackControl extends ViewGroup {
 		});
 		MapStackControl.this.addView(expandView);
 	}
+	
+	public void setExpandImageDrawable(Drawable d) {
+		expandView.setImageDrawable(d);
+	}
 
 	public void updateInfo() {
 		for (MapInfoControl v : stackViews) {
@@ -82,6 +87,21 @@ public class MapStackControl extends ViewGroup {
 		collapsedViews.add(v);
 		MapStackControl.this.addView(v);
 	}
+	
+	public List<MapInfoControl> getStackViews() {
+		return stackViews;
+	}
+	
+	public List<MapInfoControl> getCollapsedViews() {
+		return collapsedViews;
+	}
+	
+	public List<MapInfoControl> getAllViews(){
+		List<MapInfoControl> l = new ArrayList<MapInfoControl>();
+		l.addAll(stackViews);
+		l.addAll(collapsedViews);
+		return l;
+	}
 
 	public boolean isCollapsed() {
 		return isCollapsed;
diff --git a/OsmAnd/src/net/osmand/plus/views/MiniMapControl.java b/OsmAnd/src/net/osmand/plus/views/MiniMapControl.java
index b2278ae72b..e1aa9e7e43 100644
--- a/OsmAnd/src/net/osmand/plus/views/MiniMapControl.java
+++ b/OsmAnd/src/net/osmand/plus/views/MiniMapControl.java
@@ -22,8 +22,8 @@ public class MiniMapControl extends MapInfoControl {
 	private Paint fillBlack;
 	protected Path miniMapPath = null;
 
-	public MiniMapControl(Context ctx, OsmandMapTileView view, int background) {
-		super(ctx, background);
+	public MiniMapControl(Context ctx, OsmandMapTileView view) {
+		super(ctx);
 		this.view = view;
 
 		fillBlack = new Paint();
diff --git a/OsmAnd/src/net/osmand/plus/views/NextTurnInfoControl.java b/OsmAnd/src/net/osmand/plus/views/NextTurnInfoControl.java
index 5b56b4a293..56cefb639a 100644
--- a/OsmAnd/src/net/osmand/plus/views/NextTurnInfoControl.java
+++ b/OsmAnd/src/net/osmand/plus/views/NextTurnInfoControl.java
@@ -27,8 +27,8 @@ public class NextTurnInfoControl extends MapInfoControl {
 	private Paint paintBlack;
 	private Paint paintRouteDirection;
 
-	public NextTurnInfoControl(Context ctx, int background, Paint textPaint, Paint subtextPaint) {
-		super(ctx, background);
+	public NextTurnInfoControl(Context ctx, Paint textPaint, Paint subtextPaint) {
+		super(ctx);
 		this.textPaint = textPaint;
 		this.subtextPaint = subtextPaint;
 
@@ -75,9 +75,10 @@ public class NextTurnInfoControl extends MapInfoControl {
 				st = textPaint.measureText(subtext);
 			}
 			float mt = textPaint.measureText(text);
-			canvas.drawText(text, (getWWidth() - st - mt) / 2 - scaleCoefficient, getWHeight() - 3 * scaleCoefficient, textPaint);
+			drawShadowText(canvas, text, 
+					(getWWidth() - st - mt) / 2 - scaleCoefficient, getWHeight() - 3 * scaleCoefficient, textPaint);
 			if (subtext != null) {
-				canvas.drawText(subtext, (getWWidth() - st - mt) / 2 + 2 * scaleCoefficient + mt, getWHeight() - 3
+				drawShadowText(canvas, subtext, (getWWidth() - st - mt) / 2 + 2 * scaleCoefficient + mt, getWHeight() - 3
 						* scaleCoefficient, subtextPaint);
 			}
 		}
diff --git a/OsmAnd/src/net/osmand/plus/views/TextInfoControl.java b/OsmAnd/src/net/osmand/plus/views/TextInfoControl.java
index 581a560b53..dd0bab43c3 100644
--- a/OsmAnd/src/net/osmand/plus/views/TextInfoControl.java
+++ b/OsmAnd/src/net/osmand/plus/views/TextInfoControl.java
@@ -15,8 +15,8 @@ public class TextInfoControl extends MapInfoControl {
 	private Drawable imageDrawable;
 	private float scaleCoefficient;
 
-	public TextInfoControl(Context ctx, int background, int leftMargin, Paint textPaint, Paint subtextPaint) {
-		super(ctx, background);
+	public TextInfoControl(Context ctx, int leftMargin, Paint textPaint, Paint subtextPaint) {
+		super(ctx);
 		scaleCoefficient = MapInfoLayer.scaleCoefficient;
 		this.leftMargin = leftMargin;
 		this.textPaint = textPaint;
@@ -81,13 +81,14 @@ public class TextInfoControl extends MapInfoControl {
 				margin = (int) (imageDrawable.getBounds().width() + 2 * scaleCoefficient);
 			}
 			margin += leftMargin;
-			cv.drawText(text, margin, getWHeight() - 3 * scaleCoefficient, textPaint);
+			drawShadowText(cv, text, margin, getWHeight() - 3 * scaleCoefficient, textPaint);
 			if (subtext != null) {
-				cv.drawText(subtext, margin + 2 * scaleCoefficient + textPaint.measureText(text), getWHeight() - 3
+				drawShadowText(cv, subtext, margin + 2 * scaleCoefficient + textPaint.measureText(text), getWHeight() - 3
 						* scaleCoefficient, subtextPaint);
 			}
 		}
 	}
+	
 
 	public boolean isVisible() {
 		return text != null && text.length() > 0;