From 5ed3968771522ee774066bbcd05e76996d3b812f Mon Sep 17 00:00:00 2001
From: Jimmy Shih <jshih@google.com>
Date: Mon, 30 Apr 2012 15:56:07 -0700
Subject: [PATCH] Use a location image button on the map view to show current
 location.

---
 .../res/drawable-hdpi/menu_my_location.png    | Bin 1784 -> 0 bytes
 .../res/drawable-hdpi/my_location_normal.png  | Bin 0 -> 1414 bytes
 .../res/drawable-hdpi/my_location_pressed.png | Bin 0 -> 2262 bytes
 .../res/drawable-mdpi/menu_my_location.png    | Bin 1409 -> 0 bytes
 .../res/drawable-mdpi/my_location_normal.png  | Bin 0 -> 945 bytes
 .../res/drawable-mdpi/my_location_pressed.png | Bin 0 -> 1414 bytes
 .../res/drawable-xhdpi/menu_my_location.png   | Bin 2204 -> 0 bytes
 .../res/drawable-xhdpi/my_location_normal.png | Bin 0 -> 1995 bytes
 .../drawable-xhdpi/my_location_pressed.png    | Bin 0 -> 3283 bytes
 MyTracks/res/drawable/my_location.xml         |  21 ++++++++++++++++++
 MyTracks/res/layout/map.xml                   |  10 +++++++++
 MyTracks/res/menu/track_detail.xml            |   4 ----
 MyTracks/res/values/strings.xml               |   9 ++++----
 .../apps/mytracks/TrackDetailActivity.java    |  11 +--------
 .../apps/mytracks/fragments/MapFragment.java  |  11 ++++++++-
 15 files changed, 47 insertions(+), 19 deletions(-)
 delete mode 100644 MyTracks/res/drawable-hdpi/menu_my_location.png
 create mode 100644 MyTracks/res/drawable-hdpi/my_location_normal.png
 create mode 100644 MyTracks/res/drawable-hdpi/my_location_pressed.png
 delete mode 100644 MyTracks/res/drawable-mdpi/menu_my_location.png
 create mode 100644 MyTracks/res/drawable-mdpi/my_location_normal.png
 create mode 100644 MyTracks/res/drawable-mdpi/my_location_pressed.png
 delete mode 100644 MyTracks/res/drawable-xhdpi/menu_my_location.png
 create mode 100644 MyTracks/res/drawable-xhdpi/my_location_normal.png
 create mode 100644 MyTracks/res/drawable-xhdpi/my_location_pressed.png
 create mode 100644 MyTracks/res/drawable/my_location.xml

diff --git a/MyTracks/res/drawable-hdpi/menu_my_location.png b/MyTracks/res/drawable-hdpi/menu_my_location.png
deleted file mode 100644
index d7fae7e988bbaa7f6d6f51e27738e00f7818b1fa..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1784
zcmaJ?Yfuwc6b?j!Xrd^Hh$uV3qKHX$dBqKcM-oufPzWg~Y9%BK1la7dS;#}BfLaHn
zRTKe>wkirLD$Y2HE%5;kYDE~pS3yS+5Mg`)RVrhVZcwy8N_S@W-h1YJ-}%nt&gMph
zFJnz{nnI(|SYgX0GHM0Q?_>t`jj<fwPAzlDkkw=qmO$zh1VRf|VetqMhAI*f8KO`b
z(tbz$X*Bu*wR|<XTDnT0#89rn?8DWgIEALs`~&s4LYab)Ks=JD)(F|JYc8_^wMxj2
z@sWa3T#O{Cmm3Kr$`~$J8dH?8iX9jL`0E7}0g8|cK#!(sv;w`5J;p1b_GUAW4UD;v
zDMI!~QLCj9fEXhXz=sQRl%OvJ_<D08ZxHr|mjIq11o9wH9?0iFpumSO03qPh!=|DU
zssw>d68b3?brQ0ZND>$DcsiYqtMlSwL?RD@VVDPc@;p5`lm|y^(2xo}N27HeXOJLT
zC85SiHKqZ~jEZ<HofNVur5{s3@z1mx?WZzP1>@-zI1l22=9I=ArPBX*MbXdRT2h95
z(fgmoTDbv7crrwbr4vf3aS5*GP`E%$APN#A<QSGZUd4zcjKs7_7!HV|e7F!GRVdXO
zvt<k+l?uW%T2i4=B4H9Co8sWA)hdBl!e8nIiXa~m7z#ll5bO=XA>JZ!aHtQ&_ZC6p
zSP7;~M-dG<j#YiZdQONn4+Dx*ktGPB&OlV51cm}*Nek2yYM~-esO2M8HL(_OLM)FG
z!!x(`U#%WDQS)QoejZ%v@OktR4K?osHQ3V@y1>+ZNe+_)%k}Lq_BEtL1>0Z4+Wno{
z4@U1eL`J&QTgOfce(rK`){0HQxsXE^vz_>P>yv$RUWT{q-MN=*FP9vxjOCxs&)IoR
zv?Sz(%>7<o)sUOh<?JeuS*`9dV!Ky*^}FJUJ-1-5#Du1O?*@lWPoBz@dXt=W%<0S>
zR)5W+8XIS87@u>?fLax8DeC|y8`G>l<haB+bYHw+ojJ(=TI_$;GV+W~s>Qj3)12up
z!Hi7=0sbOBw6%Xg2r$mKj$XZ@+B`2t#W2yu9l7!i(e#Y$+i`xZeU^LTM8p9`Gb7d@
zu&LjW?a^U?SxaqZ#?6_P$qen~me(&nWl>X`>GX!Rjvj-i0L(Mlpude<5QCYO@WY43
z7kdunFF=x?$KTJIWIdmrR_e(dnpbvGa-7*qE8BnZlI2SgAQD-%zm2@N2ubNHtFab!
zIP}u0YvCQfb=A|e=f!<>d9wwtmi}tiIcAP4VAUC`*j`@0e%-4X&8o=9Q)O|^M{4Kp
z?y0taaBSpohdZL{>pim3?z;Xb|IRe`;`zI}her=oG`qwPt}Q{0g_k;sjmz7hYEkap
zg9q}ad!#=P3f$Z1u&V$m%^WId0Fi3#lIyHLZp_WtedB0pdK<f2)pmaEZ~!mn4vMoK
zX5RlUC~rZ1{#~tIPvO+$iUd>O^?=~Mx`xQ}7h0-YN@xoW*XoejJ{|VG$kL9kxU+AN
zx8I|xcPH(V`HLBjt&ej5l%G&IvcpXl>*<#3wmDmqUb={tKb|gnc43Vlm!v-|8x&o!
zz!{RljQDHiwNo0eD%;uL=HacUwW(Vwv4$-7`qz(g9-EH+-5OxK!bB_esq3<RUy{c~
znKgm-rIY&hi@F}JIwj%$wPyArPu;tl0mQyyk8YE$%W;I+n*YpiuK-dOmt<Qxw8b25
z3>hj|xe%#<i#*@~+u{)*YT2(3t!DQo%xEGxHiHj%_@nrtvO+b%yg$<kE~%k68961D
z7jR>kn|HMPQy{6O_i<go=mA-g>+#18y9^iY!ZsiO`J1iTDTb!1!)a9>Pu3i5z8Zb;
z4cDo2Ahuxo+Nna$6dhb^`^3$$vb&;w+fA?Xg7^EQP4-o{S@{cCzwLSU!KFWP;7qCA
y({c+pr7@6S<#$#-QgJCc=x){t3xqQ|$&t3>*3c2#xpyMX|Dv#vaLH*=T+Tl*{jMtj

diff --git a/MyTracks/res/drawable-hdpi/my_location_normal.png b/MyTracks/res/drawable-hdpi/my_location_normal.png
new file mode 100644
index 0000000000000000000000000000000000000000..742c0e04e0f50671c24fc4da3e336630566669ce
GIT binary patch
literal 1414
zcmeAS@N?(olHy`uVBq!ia0vp^_8`o`0wn*2-3S3vOiAAEE)4(M`_JqL@;D1TB8wRq
zxP?HN@zUM8KOn)f0>^Y94c5!BLqW-xfq^B<)5S3);_%y>@BM|#We$A&es}BMOWCVa
zS=XFg(t2xSfV#7=k>|3{2PgD;C>RD#?_s|!zk&U?@VA2hOp#`1O%$`7?ub27PG2Q?
zZe_4UV!EXndu!PtFYVmDuirY(&2xD+)$6x|o#*6d@2clt|9<=Z-S6)FSyD`In5F$*
z6)1!pHPPJQ#rK!Z>_FT6u&57-tGU*1c9~PX<U(%4<ZJ%@^4wmb8yR`rwwymdNl}@p
zbW4aZduOs^)Cy+7f(NVB;#M)($*9Jy2%7)jJcmPdU)#o``5&YIoIW0Ia&InYnylBu
zmN4aiL067CXC2#J5ME>{`lU8T^0p?UP_p%7FVX1v!spG8H?8)P)jM!7<GEJp&Ai-#
zYms+K{{3z<t}eW`P=P^BDNm&2sn_qR*Mzs<_si4zfArmr?6@~GO#Vvxz4JKj7UxxQ
zwXHRLk4@3MSF`5*tEjsC<Kc;ZL3yUeC%^Z<@w2zw)A4Kd_u1E<OKmGwR{9VqDXP)D
z|B`{+&9;-#!OU7OoX*te|7K3FU01r(daL!{ll<a`!f)I3xF4#Qjj4E8<0o_Tb!AgO
z>pA!CO+6jQO!uARzxQ^ge1Pw|t(6wrmuqK!Ron9CL9f~4DI6;7p%Q&_ZZALabw}aD
zWpb`|+w(1$nzIx%8;iHx%nCdGry{^@dA*Px>pJ&sf3v++9wbO#SDwyv!G5K(v0Tl;
zJ+IDbD*3LwCK@ZzTNSa}VEP9GsjIEmrY@V};TNdO*Dm%`a=q;24@yU*Cd}WeJ;9;R
z)S=?yk#jxQqwYPwSC!r@zF0`_js#1X!{?K)r%bt6!!FLO&1QD4eBL{g7rU!tR!_Jt
z+w0N6@#04JgtB$pdBr@e560;v9q*QAz8m<l|GlQo-#CGT)1&vV(GS=9ye8ZH#;>}y
z@y(~L^~<`>?DlM%mbW(elFAmA&v}B)`{whVv(?|c^xE{K@F@4BO`PAB=lm><nsk4D
z(@8bXxv`nqmAao6_Dm9;@jbgM#>OboW^v2GiJUuEXnw9^RFyupCqT|B-FMEMymsf}
zi$87|ZuKy!%i#0dZf*E-&emC1jqV$3KYgnr<=>i^vFZCV-F!Q{<fPNz@5#(+34Z9Z
zSXT3X^33fvPc_``&*lCdd*qgnUC8~Pj}QFO{qIxjR`%SP-zum`a35EE?&qX}FMUZ7
zXQPg_+@5>k%I!q{>$e_#brxQjb3N($Bm3uRQ}l0(OW7WnomGCQ>fEMj((*o>cX+BJ
zvi__obYE4Qc)cq{>QMf?&Sfq4d)X)ReSH#QDS0|3XYL#>z53nm6J%|^9RD+2Qz_}N
zqpi}nKh@=YQ!aku{ZOEAaiR?O-#=Mll~#*pY1}lgdq1-<^4(|N&ku~)t}uocAKzYo
zT`}=O_3Bj1jE|P_($e?RSd81>i#IT}zt0z0U(lXy^DoCn>(=AF)!!!`{&y!b_wtX$
zQLetrpVjN<0CShv|DsQ7RlF&(n~#V`tjc+$Vb2q>DBw|eXMe`kH4O(l+~!=p<b7q<
z-lKaK-e#C9BDrk!f4=QnxBef!Z@Ic=`u7VQ(||>gXo+h?iE~kEVo7Fxo<c}wZYqPN
zzM+}Eq2aFw0!lyysvrd^i6yC4$skp!3`PcqhPnopx<&>ehNf1=hE|3Kx(4P}1_okW
zn@UkM<mRVjrd8tBkRHx;5~x82WJ7R%T1k0gQ7VIDN`6wRf?H-$YI%N9cCmtUuxa7e
R$7Vov44$rjF6*2UngFVzdZYjV

literal 0
HcmV?d00001

diff --git a/MyTracks/res/drawable-hdpi/my_location_pressed.png b/MyTracks/res/drawable-hdpi/my_location_pressed.png
new file mode 100644
index 0000000000000000000000000000000000000000..b03dd0d66aa07674edb6ae2fe5d4e9378a7db1ec
GIT binary patch
literal 2262
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
JJF-m>@gGiG9o+x`

literal 0
HcmV?d00001

diff --git a/MyTracks/res/drawable-mdpi/menu_my_location.png b/MyTracks/res/drawable-mdpi/menu_my_location.png
deleted file mode 100644
index 9d1f4403a931ada4c33f5fab6123e5869c913804..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1409
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz$r9IylHmNblJdl&R0hYC{G?O`
z&)mfH)S%SFl*+=BsWuD@%qp275hW46K32*3xq68pHF_1f1wh>l3^w)^1&PVosU-?Y
zsp*+{wo31J?^jaDOtDo8H}y5}EpSfF$n>ZxN)4{^3rViZPPR-@vbR&PsjvbXkegbP
zs8ErclUHn2VXFi-*9yo63F|8<fR&VF+bTgE72zA8;GAESs$i;Tpqp%9W~g9hqGxDg
zU}<8hqhMrUXrOOsq;FuZYiM9)YHnp<r~m~@K--E^(yW49+@N*=dA3R!B_#z``ugSN
z<$C4Ddih1^`i7R4mih)p`bI{&Koz>hm3bwJ6}oxF$}kgLQj3#|G7CyF^YauyCMG83
zmzLNn0bL65LT&-v*t}wBFaZNhzap_f-%!s0<RzFwUtj!6b93RUi%Wu15$?rmaB)aw
zL8^XGYH@yPQ8F;%(v(3~6<9eJr6!i-7lq{K=fFZSAS1sdzc?emK*2fKRL@YsH!(Rg
z4<rKC;p=PVnO9trn3tUD>0+w{G(#^lGsVi;#m&XQ(Amh;$-vFf(ACh=#L&{!#L3yw
z&D7A`#K{n**Cju>G&eP`1g19yq1PCvUQlAlEdbi=l3J8mmYU*Ll%J~r_Ow+dR=1d2
z7#ld@HV>*d1*==YdQEV;MIY!GeNfaQMKw$an0`P^c)|s8;7LC<518JIfC>Bek$Ykc
z42+*WT^vIyZoQel+n>o%;F#rsQ{DVgCIY%VT)kpWN@80)lDBNxa5O49xx4p&!_>8N
zxx%*HkWl`?W!KcXZHB}OfphOCy`Q9eZujGNPq=PAnf~VNxpREGt&O{vXmp)F{p@??
z9X39T(ggM=b0s*eN)qI1s<tvaKaeiDx&7)Axx)cWk{g)P4zdLB)-+TXaOr6j-))q*
z!OHzWET$>E&$m&fqgi_cyPQsBsO$y@sXGly5loZ%`i^W=D!m+*6CGK@7IHvwg6@mc
zSJoD+Te$D0;EKQ^mSYF3GJ@ooA`Onew=Q6l`ZMjIp>j&|^sCndQw|7waBZ@%U^o5X
zku~Kg>t2!PX+75rxDU&$_;e_9e~rA$0rB!BC+k|06<<xWG=Hwbe<Z^r`_(r8=4pL-
z-N})TVas?|PWRctD&%937$AP^it&31i#vkvTKkLDEBl!qNQs=0kziYF^2}}Ht4|$&
zs;rkkcW^vWr79qL?8@zZSsNl6tfIP&yq~?j!`OOLNA<*&fa-^OFW=rVF5NQC=yXR~
zbj_jP3oI8N`)O9etlU#R^RLx$sY8!AZ*7R>-r{1ycWsY{OZ~jAYF#(gZ}r-4r>|^`
z>A9nET<G-2MRSYZd~p<7_GYg<ztCRwn~amMsbzfs?R(?dp9Oc1-mMS~mn_;g+vG?7
ekN2`a1QQslowEJ!+xWMG3Pn#>KbLh*2~7ZF9Rj2P

diff --git a/MyTracks/res/drawable-mdpi/my_location_normal.png b/MyTracks/res/drawable-mdpi/my_location_normal.png
new file mode 100644
index 0000000000000000000000000000000000000000..60daac9bf7d70b13bca95511c2a4d44b52a6754b
GIT binary patch
literal 945
zcmeAS@N?(olHy`uVBq!ia0vp^S|H590wnWKF<t;tOiAAEE)4(M`_JqL@;D1TB8wRq
zxP?HN@zUM8KOn)f0>^Y94c5zWr!Tw^sBNmJi(`n#@weCGJ%S5G*gw4gd-wIxSo7yH
zSC-A*%=7)he2z$u!(6T>KHO|S)czq+fMwzNi4U{A1YFnzIlf-=)<2wJ%Ht)W9aMG0
z=vwG@?+1H!emR$S`~9~7gVwUWvxOCH&OfiQ*e~CH|KV|lSO!MM=D+Q1TvDu;S+5-8
z=KsO9K+EOGgoh3fYRfin-NvNSQ1R@PtqUiI%~YkvYf%*r95cFP_6XQW1O<M`ms$8<
z+RDhlD8Xd9@vMx*-tsJlzY*e}RNjU%9IKMPT>I$d``<32-yGc!r82qeMjzl0KK1uR
zZPM3Yizetxhu-KcUiCF%oBBOnPD_V}&*tVwsa|h+dM(;EOnmOUAE~(>>`L}0i_drQ
z7Mz|Qe$MN%-N}C&ioZBVzDT+oK3!M3qh_1U$3h$SgtLN~JH<F%-o*(>iwn!Tz7I=Z
za_Fp0Rg%`sk25ReSXgX){`B~(+8W9|eD-Ln)ryeyf%{EvANknod${3o`s_cG+?M{D
z)NgNeV58WToUrGUx7}qvrIfikZdKs6GmQsh{uORuxx&TA@@2leB7=rS#6<12msctn
z+}o{~vpMhQ?T>T2!<wV-rJ1v?Hu|@!$GUXg=9F_6_n%q0dso2k>Ca_!3fGCRzvB2;
zsd>WmrOp?bPOo$hoYuC7=TFi{uep}F)BTt2Gx7Q5rkwn+Ab68pM$G;lXD)fh$7OhK
zJ)OGnz=uPBXKnd=?&rQ6OItEIPi$H*tEjJh!@N!W%d3*W;&;b(FQ4nptABpaf;83}
zBC9+_{g$rNn^By)xWQ7q;=iWh`^c@@X$NMOF5P|9OtQMA@%t9vyvdCl9Uqisyw7QV
zG5^9RH)C&y<xOtJ{MEDN7Pj|h1$;mMhC@_}u~p)Hh*wX#LX+Hy>Ft&s=WpiUxqN+w
z)=X;wU}_aDag8W(E=o--$;{7F2+7P%Ww6vYG}AXU{PjRU38+97q#z}+B-JVzq$-uc
z$iUE0*T7QO$RNbf)XLb<%Fsa9z}(8fK#XfsDT;>N{FKbJO57UK!?{iZHOPQ$2+mI{
sDNig)WpGT%PfAsA%PdMQ&o9a@R&WkBE!_Ip45*I5)78&qol`;+00u^oApigX

literal 0
HcmV?d00001

diff --git a/MyTracks/res/drawable-mdpi/my_location_pressed.png b/MyTracks/res/drawable-mdpi/my_location_pressed.png
new file mode 100644
index 0000000000000000000000000000000000000000..f4ea7f804f178d59dc3f963ec5c9343b4aeb1ef1
GIT binary patch
literal 1414
zcmZ{kdpOez7{`Aug~{cKd59w75M!HdvdnolbBmDMY~(&R#Wa(c*l|gdOAon(b>U<<
z(aCM670yX6ONMgEK`J_q$dDqloH_rUKhE<$@B4k9_xXIE_j%qwUbdHqvkK@C2mk;T
zR~NjuRFCha;(lrE=@tY^Wq-JvGalI8i#r|MV(COF-i4R|0LlmVQs(7M+RonaVmvll
zs{i_d=>oz90FaMz#bbQ~x<5^Zxcd<F6jnvHo6}5jnHK3gxYwd_OU;*(1(O{}EjOBk
z3vRU|Es3?vcEK&1O?zHh5573|XvMdu?axfRvmE;XW9ZJ1K6ONulnrW>81Z&jj-1l4
zCM(-yhtG>sMYgxAX1~oO&@5$uoNgIF56I0gL9j;q`xX1)FBR{ovQ${*v>Ey_AP%sR
zk=KEn6O*1NE+|)iV8dql+_|synK^|byZxaoL!Y=QCkNTzn+5w>QJeElW}BZ4Wpy7U
z`@b+@Xz)iquj9^ggee4Wi~Yo0bC6n{IkeHWgf7b|N1hY+CTWUsCFtOJ86ZTmgKg}A
zYEWnFQC*FO>VxJCGa+R`AL94w+GF>awnJ5<(l75Llz^wLL93XD<!O3#)<k96kLb~H
zk)M)agYQuGJ}+%bvVvlhkjB{$x0c2_Ix!EXiN0%V2*AQvK1CwpWXs)}u=xIi>MNTW
z$B#9i7EEr0gB^x8c>X<)V)A?5s-3LlPp=*8r`1fkMQP=>0bWFe{^gd77Qa5GTU^@y
zC`P5%k<zz^+6h0-?20$|Skbmy>t;q`E$-}zmGd9zvz68j!ULV;=<1uWQXTlJ0adTF
zi@Q<t*EJtut>q?rKwtDkzX8Hu>O%6`Qsc&${%3Mj-9K4s$;%9mV?*p*`zP;Sd`uz;
z<*~p$%^Ti|89-Z873Xjaudg@@5vXuE!yq&?Ch1|3Ef^~)G-otdT|XSyt0g_-&6|{{
ztn1NDMp-O&)VNLO!18N&yXk<^<nC`cZlut!<jvUP{e?>^V@qF#*9%MKOWnmdFuGvQ
z|4Gi=i7jdSQ@-8s`cbnA=r8uWi&u?GuHGxuM`QRV!?Kw&c@r#ekS&KA{9KZLrg@@&
z5uqIc)jr^2vegziVl^v{(*z1a?1FT27ah(1pxj#vn-6R4U48OWj%6`Whp^9cQF7`o
z3Pw=0j!jH);~GyXWiwmvhnhTvfpxyV&VwK)Wb^RF=1uZ!lfam!eOE9jqdwoCr9gG0
zhvTr*QhqW{(em_ii&s&R+6qSWj=HR4;Ta*wWDYS+T?J((Ux|uGDXnkH32<)pLR|*~
zMT)HmidSgY;w)oAPd0b;Nr+3Eyayf=m6E&egfiVIqtoLffb+q1!5g`DO$a!)R<Mt`
zc)vO!WKA$SGCU`_+vWAelvK03oe|fkJ9Q;B7MYn~csm6EyfbPDCOmB`PXx&z0AGw!
zU!wfIcAVo0^EGm*_aq5DzQg|v{-FB$T8gMMq9fkg;#~F%H&;ZkLGE$PJI5oa&!af!
z%RB<ar9Lr7mPNYmt&ftRF-QV(w=AhJ85K}pXx!ijc=@Xr5VSGxt~4ykFxiANavu&<
z<aa#N6@(XX5^RCD6fwK<k@iXMFxQA{+#{-50u3GkJrWLx!F;7bn^27kTHOs=e>(m-
z?iDZ{cN<+!8|i8}PnUD)f_BjqSHpMI#R~S4(wfx4{50wN0W%x}7!GuD7=ucSGw`Lx
zk^x&Q7|IF;+kUHVC<To7fXFZg86B}lkpVaq27^FtA#kWK42iaep<z%6)CLWOYJr*)
z|6_=yMN*@Z|KAWz012c9y}b=Sv?xYW7@Z7YBWdAe11Bn-oJ6CaOE7ToL0)K^LrFQn
M)zJgrgbU612g)RN{r~^~

literal 0
HcmV?d00001

diff --git a/MyTracks/res/drawable-xhdpi/menu_my_location.png b/MyTracks/res/drawable-xhdpi/menu_my_location.png
deleted file mode 100644
index 52ca8ab7f3a772adb94abdc33910558ec42e2f6a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2204
zcmaJ@X;>528V(3TSOipdsUg9IEgNCU81@MeE(sbaf(sDBfT>9)CV>P*rR*rdA|j}O
zy`pF>Du_y1Bp9exz^g4N2na?r+*%ius;DSUtZ08+?wn`lobx^J`+n<>DO}44Ha4&^
zKp+stv=ES~-u*PM{zCQl6ldG0db1W&qs0+$l32nLLJ0pvH~~V@c&ucI39%B>wq1iL
z2*d&hPGqz=njQwQVIG#H!C<94ftrm#P<*8V7JDlsMkPSW9KJXDS*sk4;v{;b*Spj4
zbU`4rg%gr4gd)-zk?i!XY;q#n*9S$B0%`#sBxa$cJT6}ZNWIY?bpiERW5%ITA0gtc
z-sr!Bil(nc1;RoI<&MR>vhf}Slm`h*AmPa*vI~lcC*W}eA`b8AO27l|o&cVJ`t+dH
z-h_!s022)Q<V$_?MsE>|1pp2wkw~x-H!Lhn#u3P5G7e9~5s9v9gsUixFJ?(y`6A4m
z0tkuNLXJSpf%zznA}aw-5qqQ6k^Y?mPw-imFZxs_b-{2_mH<b<;x#GF0qOMr59RSb
zqeWsS^d;W^DJ+Ui6F@j7B!W|fY<1(3FdA0^AW#Ug#IP_DhPiW9T)PDp!=f#)02LVF
zjwPVzEH;O)v3z9E=>Ux{60`Vhhz5G2)f!k1ClLq)J-yuU{-ApRK8Qe|638S1nMw)>
z^bc|;c#;ALb6gN+r|=-Yc#fO+g-e~6s~HBKK<ycXgq&0;F-QpWP#=>9IP=F6Ft6Sx
zZsPp01kTIFse{33TKkVy&zaQoqd9&aT=nJi=tF$<ybINXoy~5YMj&(-(Ln!5>Codt
zF$J5bOY`2P-cWhjnCCg<(MWr`RzHgGEf_v*rCWnLw0gIxK#L0c>(=N{Nm)maqMWj<
z9Iz%>lfvm^@dX6px&WgquE-@zRF_vUh#MvEmd{|9mJj#!@LF3=Jp1;@!Qt0YRj1^P
zD&WMatb~RNPBN0I{m+&03srGEAZpNQ=24BA-B;I|{^PsyLC%rkl1xYCa{Y=|w+gtm
z*MDB6b!N)(ysehU%a&#6^bGpdpwrs7?@Z-Bl+M0UF!OV^DJ_)}R#ScWASUc0pmj+h
zQ`|De>*ZU5VZMJvXU8bwOedQsO9XA^$Y|G*&XB_=ZuB*?6=tmd=L>>D<oIwe-F*t8
zFY+vMctdVxUyfd`tyN5CPJKD!ac6%p=Hc6eHa+%m?oC;lm5)WN=?89-wuM2sVL5&m
zZ>fB#hhg0MhS9^vjgU>q^(>?c*KRKb28(nmSG2jfTs}W*8f$sc^v`~Dl>$&=mEzjn
zRM~4ox%(0=)kv%v_R1y`BC|6EEivuc@XP+UQ9qd^-&wk?BTx|v>?)X00*uqFN0gl6
zGKy!e?j{T+KW(UB#5p6bwuoNpR^`<(^E0b=`^siNsrjD9JYSa#RViZQ#Mtq`B>Ihe
zlcCoj#q}<osmT}CQH7Yg_s<N6lTVJPD%ZJO)^ByERerZW^MYbr{K2p?qOx;Mj1>H-
zx?Zx+{IYC;Vsh}PB0QI_hz{HA?KRxvIJ<wc+GP37p7g4kU*Yoqw(V##JGWc>jnh6O
z^EbSr*#Ty)XRS})ON*$|8skeo`q6og6G&m|l^83GJa0t4ukLI|)7I6tT^Wr_s?vt)
zd-b$f+%Z~?<v_DNK(w%a9?E=3=w4KY;@GxK+&qxCL|{KP4F_SI$XONDHdF7lp@DVl
zBVQfee&`~pGV{%T&u2SGs`u!im9)?`G`l?sqjpruffW~2vck}S5m5!q-zm3>u#?fa
zVHWlMbO%)YA;6+O?q29gi6gJsR&kDDbt(IOE~v9<6}N-XEUfEod%AEO*>t_7O3JE*
zzbcp+4W6#7$keVma)Z?LAfdYPWrg;dcwx7FS8azKbbAbG8riH3mj7Bv>|5Q@?E%in
z%qH31`h%MlMQ0owf7ip5yvBI_@ImKyfnG{cSDWF>h12<`WwE-8*v6`3sw-{2e%!G#
zzhKLhWd&)TmUneiD{R`0c3#!5>VEZg<O^<I(ZI=7Bca1g#cZ9QM32Yu(%K%f>qNoT
z@ki%)_2D6TSxyt}WpBO%?hjqExvN|x>_iUky}zuc;Z)b+3&_Q9o%+ikZgif?K<c#^
zRFQ}3$Mm$W7G9mI>-+<`dAxl%q}!&Lo7{!g-f8Fxxj~HmA^8I}ZsE3VPxL@fu-bf-
zbHcdf;@D!thcxBNu-`nePvRfs1HtJNNgvi&S;s%!g`$+4|1JHA!QsXs>W&2zliLkb
z+5P0q;?0y*2WH>JKQIn@1j<sXbD+BiIWMwH*4{6^(w-o%AF63^&e=FUyf~Qs?|z}z
zH+DYRW%iV1-g_BM{mPThx0dZ~)j2=&TuNe`e2@j+J9fQMl?9T1+!I?8^B62HE&8*r
z74249>h`15%vnm4x{WK_zdyS%q3_tWZ`oS0*nhokTU8-*2t1gI`QGtZXX8_!11*d=
z*<{-04_xJj%J@4AitdE?MTCU<eOb0Wa&037MZ4G9>Rzs!=6``kWq@Y_;<Nq&oQ8u1

diff --git a/MyTracks/res/drawable-xhdpi/my_location_normal.png b/MyTracks/res/drawable-xhdpi/my_location_normal.png
new file mode 100644
index 0000000000000000000000000000000000000000..f1b6eb9607a5e381f8468bf8b52a0d47478a1271
GIT binary patch
literal 1995
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

literal 0
HcmV?d00001

diff --git a/MyTracks/res/drawable-xhdpi/my_location_pressed.png b/MyTracks/res/drawable-xhdpi/my_location_pressed.png
new file mode 100644
index 0000000000000000000000000000000000000000..c49415222f25d50474c4a4cf95071e8bd75d6a63
GIT binary patch
literal 3283
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

literal 0
HcmV?d00001

diff --git a/MyTracks/res/drawable/my_location.xml b/MyTracks/res/drawable/my_location.xml
new file mode 100644
index 000000000..7caede76c
--- /dev/null
+++ b/MyTracks/res/drawable/my_location.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+Copyright 2012 Google Inc.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+  <item android:state_pressed="true"
+        android:drawable="@drawable/my_location_pressed" />
+  <item android:drawable="@drawable/my_location_normal" />
+</selector>
diff --git a/MyTracks/res/layout/map.xml b/MyTracks/res/layout/map.xml
index f2e3b14bc..95f808304 100644
--- a/MyTracks/res/layout/map.xml
+++ b/MyTracks/res/layout/map.xml
@@ -26,6 +26,16 @@ limitations under the License.
     android:id="@+id/map_view"
     android:layout_height="fill_parent"
     android:layout_width="fill_parent" />
+  <ImageButton
+    android:background="@drawable/my_location"
+    android:contentDescription="@string/my_location"
+    android:id="@+id/map_my_location"
+    android:layout_alignParentTop="true"
+    android:layout_alignParentRight="true"
+    android:layout_height="wrap_content"
+    android:layout_marginRight="8dp"
+    android:layout_marginTop="8dp"
+    android:layout_width="wrap_content" />
   <TextView
     android:background="@color/warning_background"
     android:drawableLeft="@android:drawable/ic_dialog_alert"
diff --git a/MyTracks/res/menu/track_detail.xml b/MyTracks/res/menu/track_detail.xml
index dde2b1e88..9ac4de21e 100644
--- a/MyTracks/res/menu/track_detail.xml
+++ b/MyTracks/res/menu/track_detail.xml
@@ -76,10 +76,6 @@ limitations under the License.
     android:icon="@drawable/menu_delete"
     android:id="@+id/track_detail_delete"
     android:title="@string/menu_delete"/>
-  <item
-    android:icon="@drawable/menu_my_location"
-    android:id="@+id/track_detail_my_location"
-    android:title="@string/menu_my_location"/>
   <item
     android:icon="@drawable/menu_satellite_mode"
     android:id="@+id/track_detail_satellite_mode"
diff --git a/MyTracks/res/values/strings.xml b/MyTracks/res/values/strings.xml
index c026b063f..5e5fd1054 100644
--- a/MyTracks/res/values/strings.xml
+++ b/MyTracks/res/values/strings.xml
@@ -1070,10 +1070,6 @@ limitations under the License.
     translation_description="In the menu, to show a list of markers for the current track.">
     Markers
   </string>
-  <string name="menu_my_location"
-    translation_description="In the menu, to display the user's current location.">
-    My location
-  </string>
   <string name="menu_play"
     translation_description="In the menu, to play a track.">
     Play
@@ -1155,6 +1151,11 @@ limitations under the License.
   </string>
 
   <!-- My Location -->
+  <string name="my_location"
+    translation_description="The accessibility description for the My Location button on the map
+      view.">
+    My Location
+  </string>
   <string name="my_location_approximate_location"
     translation_description="When displaying the user's current location, a status message
       indicating that GPS is not available and an approximate location is used instead.">
diff --git a/MyTracks/src/com/google/android/apps/mytracks/TrackDetailActivity.java b/MyTracks/src/com/google/android/apps/mytracks/TrackDetailActivity.java
index 5fe11f822..54ecbdf7e 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/TrackDetailActivity.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/TrackDetailActivity.java
@@ -237,9 +237,7 @@ public class TrackDetailActivity extends AbstractMyTracksActivity
     menu.findItem(R.id.track_detail_chart_settings).setVisible(
         ChartFragment.CHART_FRAGMENT_TAG.equals(currentTabTag));
     menu.findItem(R.id.track_detail_stats_settings).setVisible(
-        StatsFragment.STATS_FRAGMENT_TAG.equals(currentTabTag));
-    menu.findItem(R.id.track_detail_my_location)
-        .setVisible(MapFragment.MAP_FRAGMENT_TAG.equals(currentTabTag));
+        StatsFragment.STATS_FRAGMENT_TAG.equals(currentTabTag));   
     MenuItem satelliteMode = menu.findItem(R.id.track_detail_satellite_mode)
         .setVisible(MapFragment.MAP_FRAGMENT_TAG.equals(currentTabTag));
     
@@ -343,13 +341,6 @@ public class TrackDetailActivity extends AbstractMyTracksActivity
         DeleteOneTrackDialogFragment.newInstance(trackId).show(
             getSupportFragmentManager(), DeleteOneTrackDialogFragment.DELETE_ONE_TRACK_DIALOG_TAG);
         return true;
-      case R.id.track_detail_my_location:
-        mapFragment = (MapFragment) getSupportFragmentManager()
-            .findFragmentByTag(MapFragment.MAP_FRAGMENT_TAG);
-        if (mapFragment != null) {
-          mapFragment.showMyLocation();
-        }
-        return true;
       case R.id.track_detail_satellite_mode:
         mapFragment = (MapFragment) getSupportFragmentManager()
             .findFragmentByTag(MapFragment.MAP_FRAGMENT_TAG);
diff --git a/MyTracks/src/com/google/android/apps/mytracks/fragments/MapFragment.java b/MyTracks/src/com/google/android/apps/mytracks/fragments/MapFragment.java
index ef43990fa..03163f496 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/fragments/MapFragment.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/fragments/MapFragment.java
@@ -43,6 +43,7 @@ import android.view.LayoutInflater;
 import android.view.MotionEvent;
 import android.view.View;
 import android.view.ViewGroup;
+import android.widget.ImageButton;
 import android.widget.TextView;
 import android.widget.Toast;
 
@@ -86,6 +87,7 @@ public class MapFragment extends Fragment
   private View mapViewContainer;
   private MapOverlay mapOverlay;
   private MapView mapView;
+  private ImageButton myLocationImageButton;
   private TextView messageTextView;
 
   @Override
@@ -100,6 +102,13 @@ public class MapFragment extends Fragment
     mapView.setOnTouchListener(this);
     mapView.setBuiltInZoomControls(true);
     mapView.getOverlays().add(mapOverlay);
+    myLocationImageButton = (ImageButton) mapViewContainer.findViewById(R.id.map_my_location);
+    myLocationImageButton.setOnClickListener(new View.OnClickListener() {
+      @Override
+      public void onClick(View v) {
+        showMyLocation();       
+      }
+    });
     messageTextView = (TextView) mapViewContainer.findViewById(R.id.map_message);
 
     return mapViewContainer;
@@ -150,7 +159,7 @@ public class MapFragment extends Fragment
   /**
    * Shows my location.
    */
-  public void showMyLocation() {
+  private void showMyLocation() {
     updateTrackDataHub();
     keepMyLocationVisible = true;
     zoomToMyLocation = true;