From d0bec34ec4c5f3db9f6b8452522ac7b9d405a409 Mon Sep 17 00:00:00 2001 From: Jimmy Shih Date: Mon, 26 Mar 2012 09:59:27 -0700 Subject: [PATCH] Add action item icons for - record_track - stop_recording - search - settings - help Note that the record_track icon is a temporary placeholder until the actual icon is available. Change AndroidManifest so that splitActionBarWhenNarrow is not applied to all activities in the application. Rename menu strings so they are more consistent. --- MyTracks/AndroidManifest.xml | 3 +- .../res/drawable-hdpi/ic_menu_recordtrack.png | Bin 2315 -> 0 bytes .../drawable-hdpi/ic_menu_stoprecording.png | Bin 639 -> 0 bytes MyTracks/res/drawable-hdpi/menu_help.png | Bin 0 -> 1533 bytes .../res/drawable-hdpi/menu_record_track.png | Bin 0 -> 1142 bytes MyTracks/res/drawable-hdpi/menu_search.png | Bin 0 -> 1764 bytes MyTracks/res/drawable-hdpi/menu_settings.png | Bin 0 -> 1540 bytes .../res/drawable-hdpi/menu_stop_recording.png | Bin 0 -> 1055 bytes .../res/drawable-ldpi/ic_menu_recordtrack.png | Bin 1250 -> 0 bytes .../drawable-ldpi/ic_menu_stoprecording.png | Bin 343 -> 0 bytes .../res/drawable-mdpi/ic_menu_recordtrack.png | Bin 1593 -> 0 bytes .../drawable-mdpi/ic_menu_stoprecording.png | Bin 384 -> 0 bytes MyTracks/res/drawable-mdpi/menu_help.png | Bin 0 -> 1314 bytes .../res/drawable-mdpi/menu_record_track.png | Bin 0 -> 1090 bytes MyTracks/res/drawable-mdpi/menu_search.png | Bin 0 -> 1394 bytes MyTracks/res/drawable-mdpi/menu_settings.png | Bin 0 -> 1339 bytes .../res/drawable-mdpi/menu_stop_recording.png | Bin 0 -> 1047 bytes MyTracks/res/drawable-xhdpi/menu_help.png | Bin 0 -> 1793 bytes .../res/drawable-xhdpi/menu_record_track.png | Bin 0 -> 1221 bytes MyTracks/res/drawable-xhdpi/menu_search.png | Bin 0 -> 2127 bytes MyTracks/res/drawable-xhdpi/menu_settings.png | Bin 0 -> 1641 bytes .../drawable-xhdpi/menu_stop_recording.png | Bin 0 -> 1114 bytes MyTracks/res/menu/main.xml | 33 +++------ MyTracks/res/menu/search_only.xml | 2 +- MyTracks/res/values/strings.xml | 65 ++++++------------ .../android/apps/mytracks/ChartActivity.java | 2 +- .../android/apps/mytracks/MenuManager.java | 4 +- 27 files changed, 32 insertions(+), 77 deletions(-) delete mode 100644 MyTracks/res/drawable-hdpi/ic_menu_recordtrack.png delete mode 100644 MyTracks/res/drawable-hdpi/ic_menu_stoprecording.png create mode 100644 MyTracks/res/drawable-hdpi/menu_help.png create mode 100644 MyTracks/res/drawable-hdpi/menu_record_track.png create mode 100644 MyTracks/res/drawable-hdpi/menu_search.png create mode 100644 MyTracks/res/drawable-hdpi/menu_settings.png create mode 100644 MyTracks/res/drawable-hdpi/menu_stop_recording.png delete mode 100644 MyTracks/res/drawable-ldpi/ic_menu_recordtrack.png delete mode 100644 MyTracks/res/drawable-ldpi/ic_menu_stoprecording.png delete mode 100644 MyTracks/res/drawable-mdpi/ic_menu_recordtrack.png delete mode 100644 MyTracks/res/drawable-mdpi/ic_menu_stoprecording.png create mode 100644 MyTracks/res/drawable-mdpi/menu_help.png create mode 100644 MyTracks/res/drawable-mdpi/menu_record_track.png create mode 100644 MyTracks/res/drawable-mdpi/menu_search.png create mode 100644 MyTracks/res/drawable-mdpi/menu_settings.png create mode 100644 MyTracks/res/drawable-mdpi/menu_stop_recording.png create mode 100644 MyTracks/res/drawable-xhdpi/menu_help.png create mode 100644 MyTracks/res/drawable-xhdpi/menu_record_track.png create mode 100644 MyTracks/res/drawable-xhdpi/menu_search.png create mode 100644 MyTracks/res/drawable-xhdpi/menu_settings.png create mode 100644 MyTracks/res/drawable-xhdpi/menu_stop_recording.png diff --git a/MyTracks/AndroidManifest.xml b/MyTracks/AndroidManifest.xml index e18dd20a7..9ba432210 100755 --- a/MyTracks/AndroidManifest.xml +++ b/MyTracks/AndroidManifest.xml @@ -137,8 +137,7 @@ limitations under the License. android:icon="@drawable/arrow_icon" android:label="@string/my_tracks_app_name" android:name="com.google.android.apps.mytracks.MyTracksApplication" - android:theme="@style/ThemeSelector" - android:uiOptions="splitActionBarWhenNarrow" > + android:theme="@style/ThemeSelector" > RNYjz~}hXLOUq$Ov)SmYF3}&@GOTJ+nVdrlKs_{#e`}BXc;!ESdZXI66uG6ny@*j`8J^P@^Yts|GsZ{bVZ@1eWX=!N#+1c5na5)ENr8Wzn zWu?$;0L$$PQ@A==eU^eK7$t?G1`9;1sHoU{@7}!)6B84e7Kk3;xaM z@9#el8XDRj8ynkNSXg*v`SRss@MANW1%Xjm4xa)fP>df16I5SczpACB<(<*d(R{ck z4M$?j+nfVQXYC&*dGt?a&k_7~CSe!vu3OjV@(8ohVL+`;C z*CZw;60KItgFz@9$MGfvv#>Ep2m}p5&Cbs9s=9OM4u2gP8Ts?BUAxL5W(`wCS*e<& z0qF4I!~842U@jGWWx{6BLr&n}8I|tr{B}(@vj0eGY=B z7COmiCRg0a8AxbmvzdT`$fHM(tQi>@`$|hof1yg6bp;aVA{@+Cfl%nhpFMlF3ThS} z4nX2vVPQschw&YOLBQajl$3<3_3P~H{JOTb_C@%ShK3P^w*X;{6MFRM(QiTOD=_Au zau!S1?luM~IXM|$wHOE6+uL=t+~7P7h`Ck}WU+mat+wFkg@lCg9rYxbg=)fVi30`M zPG3_~^EtXdjgbmZ0>ZyjU%PfqH#j(08WR)4SH#|gBUBP*Hl0p~_0nsVm6e-mT_!4H zt3;{?|4swbhf;_;p;+e#V~!LW6p&iP&So9UFq=}Mau3CREY_3QCa`oD?l z!Bp<)nDabW!wd=&Tr2~!p!|4=#!ICq6vWT7E?l^<6M~@zT}w*J5jKp8m{EIsd*6o3 z-|2kKso6g#(!Bzp-gp V=R?C}%Mx;Q&G*`O3|kHzR3cQMl8^`0RD@;>8pQhO5HD z!X)KdivdCvfzs8G_VXwp&YdpCPe^-uda@xn^EHpuPlsUgz|;=`djnk7cmxpKEDHfi zHTEoQ*jJ0il13GzbT=RsWQJs6?2&rIEDObK68*lMJ7W;P0|8a)3sMfw3ym(1Xs%wp z8b`l_!d(jDw`RbvgR#!=mD6b$hp@i}gCR-)$l(q^WO{m91vk{-O?~P39s)9(&7sbw zd8Yvd1qIpII*+db0ylGdUC3EL{B|(h%!De!^|9I?AUll2IPO&Vl7bKr z%*`GWC-=|90I~s~zX48yuK+^#g3`pae*OCU?goS(K8M@EPO$P7I*6Yu8?eo7!0|BxPfOv|8;SVid%Qh(UAd>FEzZ zw(TfgU#Oy?O>W${@d^>K1tca&IALw+t zFR(LG3fMT2#z6}Y4?mTgo7+VmZ~2Hi=^+*nQ_*x`VPPHA7!A09&t~}EPV3kg7_?gj z1qENaq8?WOF%@CjoZPl;+h;Ihy;9hEMmW$H%jP&Mj*jlYvx%5yJy8ha zF+aH9U`9s98vv(%so*RLAXMO@uV;ycQ<2__U5-I1A@*|wB$mc+#X&cE+ZoH)U@rt!E*NK;eO>o6Vp6kQI_IOADDSC>fG0dz>= zXp^9v%60439gm2Jz<_L`F-JPbfQ5hrkd!noY0PGGcyn`ek-=bie|maai)Wk>l+|i= zY7U34go?rKZV1K}0CEb7zzV3thA0>dk>Ww};^N{(M;Sn|L*+cE;o;$!?(Xilj7H-Y z0F({jIC#$=zQj}X7|`*=Dw{)L;Kc$I)dF=EU-*Ij1#p_7Ks~i`<;s2m7*^*=7ph3Zr(w-Me?AdwYAgOifMYf|B&O=m&uKSAk+~VHp7x`Yi+l+3DBR z)YL&T{~(J+;7-zgnB`f376HYc{9(Y@d-m*@Lby4=mUyYnQl&5`c2KXQy1LrES<(}A z3P5y#+o9RP_2wvu88ZJsor3)LfjS{1W)3VXFwlEy4N4*Z=O%8hgJeK5Ai2qaWI!?? l8ITM}1|$ReU$%b)7y!QBpW`-u$7TQk002ovPDHLkV1hTiQ7Qlc diff --git a/MyTracks/res/drawable-hdpi/ic_menu_stoprecording.png b/MyTracks/res/drawable-hdpi/ic_menu_stoprecording.png deleted file mode 100644 index a55f09f2736b5db169f4431df9135c425040d4f8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 639 zcmV-_0)YLAP)VbVTJPoax6qmP+4E*)d6wS@Ka%76fX z00@8p2!H?xfB*;!fB-1|Dgy5_BV}^cxcCpvUanrr0eL97Qz^eAQ<#mtsCD{s>PE1V z1LFHCr^aa}pmJq^IsxL+mhyg|`pcru#S^`N0=;kE`K)(dR-GUXv5My^S7D`Ne z25IkN$RO<*gf@So8EQ3Yw0Z1h50l2n z9r(E8v^3UutO_O#4?>$)pFxl3^w)^1&PVosU-?Y zsp*+{wo31J?^jaDOtDo8H}y5}EpSfF$n>ZxN)4{^3rViZPPR-@vbR&PsjvbXkegbP zs8ErclUHn2VXFi-*9yo63F|8hm3bwJ6}oxF$}kgLQj3#|G7CyF^YauyCMG83 zmzLNn0bL65LT&-v*t}wBFaZNhzap_f-%!s00+w{G(#^lGsVi)z|q{?!q~*r$-vFf(ACh=#L&{!#L3yw z&D7A`#K{n**Cju>G&eP`1g19yq}R~E*~!ht2&Z09V#qB3+U$~Alv$RV;#QQOs{r=2 zRVHq?;5HAcHwBwpApS7M=@xyUWAs5$ixkx`Az=CeG2sap$bl#Q)I4B%F9IfPQ}q|m z7#NuHJzX3_DsH`*aXMQ#P~=$pq-UXvb4wLtMO~u#rr?{e#Q zS!;G&(7UruA@7%g(vISV+y{G|oS9h{26S>YEt{pL_Lr}Q`LHVIG_}3oPuYG*Hacvu z^Zwk=GW)|;SDHm1*?eaXgZcr^0;Vrf?%ngRGqWAEEU^0W$LI#ze2=3ljDZEbJ`LUv zL_8V`TE94ozGDB?s>JTFz-%rf&817J&m^$rsxGe z*?6<>MD<=7sEMUhpLqw#M_8{gkj^yrdB3-oY`C?XXqy1Kl47Ts;=3?bsl5gTeZN ziUf1|i=@WR)w1bt_FPw8;1s`)i|c`D#Ze#OZ@HXr+8=PmY8dQX9-l5yT{6}4L!0%z z6K)5RPP8`h{^84e;j{RW(fNN5_vPRDJ7rSb*0hDqHzL_eLVx~m;$=$mnH{Kl)@$1> zlh_8GqG^nOqE|kc)O6iP>;m_*gHtwD%s;rF$8Oe@Gp%oJDvl%vM(#Os$os>QEqNve zFWuyu?NUDmrY&5+uk|wT*{ewP3a+*(W{aD5>u*gsc%@Pybz-O7w0cY75FDR6kEM9Qf(TJr;*a367%X895Kd416_?i)$37j#XEIDK0op;dBux3l-G{r6?d zN^DL!T{}B%SO4?*2enpjTz%w!tZEq(INC2{|7PN0nDu93$(>m?EuaF~)78&qol`;+ E03={S=>Px# literal 0 HcmV?d00001 diff --git a/MyTracks/res/drawable-hdpi/menu_record_track.png b/MyTracks/res/drawable-hdpi/menu_record_track.png new file mode 100644 index 0000000000000000000000000000000000000000..ad8ada6bdfa0d08e96c96ef2e8fc6656efc31f34 GIT binary patch literal 1142 zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA1|-9oezpTC$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|8hm3bwJ6}oxF$}kgLQj3#|G7CyF^YauyCMG83 zmzLNn0bL65LT&-v*t}wBFaZNhzap_f-%!s00+w{G(#^lGsViy(A34k#nsr<$-vFf(ACh=#L&{!#L3yw z&D7A`#K{n**Cju>G&eP`1g19yq1ObbUQlAlEdbi=l3J8mmYU*Ll%J~r_Ow+dZnqfX zG!Lpb1-Dy_aO%|uIz}H9wMbD769T3m5EGtofgE_!Pt60S_ab1z4q0f*3(OQRJY5_^ zDsH`*smOQ8K%~vwiGeZv-~+WZOSZ=B1v}ZkA5bcg&|!bTpuiCPPfc~@%_GO8r_|{G zoD{$H=e4|Q-{R*n(~6#QC^RrIg@$%jp0M7yea4df9|g;jBtNOTHZI@cdUHutO?01w6Wim;H*=-YJSF-6)vTXc4;gaVh((-iXfZZqW+vo+u8V zBVlX)f0A7h-RPgQQ0YmtMO4nhGu#pz1)d)`lqGk1{e=6U^-ld^7jR%;WC0UGRzbha uDrBCXJI|cEda|~f-cO)#l3^w)^1&PVosU-?Y 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 literal 0 HcmV?d00001 diff --git a/MyTracks/res/drawable-ldpi/ic_menu_recordtrack.png b/MyTracks/res/drawable-ldpi/ic_menu_recordtrack.png deleted file mode 100644 index 60f3c67e6c0b8580242e6e620d8b51bf7a1a1df2..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1250 zcmV<81ReW{P)5Fi`a@%*cU~x3(Hb=LF|JU^esy(6l^JoBIuKk`_L8&E2v$el!B-a zZ4l~pwXSQjY0_jeGyVSIj6`>0Mw5j?J@AoaJahi;vDo{oS2xAa+@; z>k=|@RUC73bDq`J)o(H1T~boQ2o{TlnM@{TG#Zu3k|Ze*MUe%ALAJBAL&Sv2%E~WC zMnboyV`F2FXoG+S-!;8+6(K8j_ulgI^4B(-EuR+7&COLvs483q znnUCe=*;bQv$C=>w!6FgWOjD84QtzI!&-z=#Spp5H99)_7@0IwUth26R!b2*gKQuZ zSs)Ogfd6G`YU*P=e#PTSPNxv5V+n;q&Xbdq0SaCybRlT33nD}=CZ(X-2h-EjAM#{* z%f2~PFfT4Hw!uY(#l^+vWHKENhlAPecDBF2@59gMK!jKIw1g~hl~)a3O5Ynm0QWzK*ko6Lxi7}M<)0UQ&&rl%4nUEs4)BAAMQ?J*%Mw=yf zX(h~6gh-``$K(06wzl>m`k@FlT;x7A*wcXqon1vmMGR-+d{B*mA?J&$1NeP@vi^_09KWHN|k1|%Oc%$NbBBuiW)N`mv#O3D+9QW+dm@{>{( zJaZG%Q-e|yQz{EjrrH1%{q%Hk45_&FW=0^_VFjMH#~b(x^N((~745$i{H0;up~XFS z7vwYF^m@JJ!tum#=fb&-4FMhV>xFn#&sm;0={I4f=mMq^3k9j4b>Hefo}2Kky0X5a zK95o9*o@WJezmQ1xL&#{_xA4iUF$_B1#McExnPx+$c#jZXESC8yKyiovJ{*PY*@3k z_{8)ja|&}wRZoRtMl6raeRE| nY^P~2%@x4-%Y4Ch24;rW_g=Q1=6gO57zhlWu6{1-oD!M<4ZM&5 diff --git a/MyTracks/res/drawable-mdpi/ic_menu_recordtrack.png b/MyTracks/res/drawable-mdpi/ic_menu_recordtrack.png deleted file mode 100644 index f2327cef77ffca87efff1858b5bf74947d3d9a4a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1593 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 literal 0 HcmV?d00001 diff --git a/MyTracks/res/drawable-mdpi/menu_search.png b/MyTracks/res/drawable-mdpi/menu_search.png new file mode 100644 index 0000000000000000000000000000000000000000..587d9e0bf392fc928947f04293ba009f7fc77b29 GIT binary patch literal 1394 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|8hm3bwJ6}oxF$}kgLQj3#|G7CyF^YauyCMG83 zmzLNn0bL65LT&-v*t}wBFaZNhzap_f-%!s00+w{G(#^lGsVi)(9*=*)zI10$-vFf5X3XIbTx5uc62i} zG&gZFgz0t3PcF?(%`1WFO+n~&!KoLN7;+1MHoK%2WtOF;xE1B+Du6w0m5JLejyTPO z>P^Az7AKr~^?{Dj2SqJXRKtXT=?BDwCtM&0p7c}mfa$#mn6M+i2Q6b@V0_}~;uunK z>&^AE+Ae`I$3E`tm@-`{zx9(?>dU1k*tm~+ZG0%dVMD+vFR`R_eQ9k~)lEW^HhtI? zB&0NvW8=gpsXg!4y8B+<@$PBQ%`+>{C%wC~^SkBqd7pQuuW?X#(4E%(*>&epCKp?W zrqiE|F7`;J9Gc@U;Ny}9H~GSBM$UJ2|47y7x^EaYbO zm=^RUfnEK@zlTwYmbEt*&h}S4{%}u`&SQ?!WlSjvv9{-n3Kw#{NfhghW2)KCHS6mc z^@8V*Jmr$4uC6fJ$dg^zU&?d@|$3_EuOa%?|q_h0a*8dJ>+>(i$vUCaNY#uTIE zul#VEs1omUHKv?ZC$?1V2%BBCKXsA7(geZX8pRvuyee!cJTgs9KN2D`QS`=`xX%9*}?nyAhK z_Nf-Z4{Ui>oBh!|a6Nmso8l+YBlF(g-ZfEwMbWdDrE^;>d8}GD@Z@>D4V>xD8CRkc zdVC*mVv&1FrpctHKHIFmo)(#Y4~A;Ho~#?e&Q2v6MQ%0zKUO`Q$Im5rVUFgn)AKHP zSBG=VuX=ZVUZK&Y$p$gc*{*!{ocg_l3^w)^1&PVosU-?Y zsp*+{wo31J?^jaDOtDo8H}y5}EpSfF$n>ZxN)4{^3rViZPPR-@vbR&PsjvbXkegbP zs8ErclUHn2VXFi-*9yo63F|8hm3bwJ6}oxF$}kgLQj3#|G7CyF^YauyCMG83 zmzLNn0bL65LT&-v*t}wBFaZNhzap_f-%!s00+w{G(#^lGsVi)$k4*r&A`;u$-vFf(ACh=#L&{!#L3yw z&D7A`#K{n**Cju>G&eP`1g19yq1OzjUQlAlEdbi=l3J8mmYU*Ll%J~r_Ow+dZnqfY zG!Lpb1-DyFaO%|uIz}H9wMbD769T3m5EGtofgE_!Pt60S_ab1zzTW#wpMimKt*47) zNX4x;(`~&EJ4hU#eM=~Qh3+e*AEGP=FItrrTsY|WOZ1EJjvdw(oa_9oZXR?!=qWq3 zDc-Rl$fx$;g=0VJAIMucT~d2m6!_%<`}Cr{HsA03uk3vKyH4?Zpw1JUBJ%}HD)(!x zD6V6UWBYsX(wau*4TpZR-Y}|UE&5gYfy*j^@ysj}hnSn8^Y$O`h~hOlpeFH@&9n6n z+cyXQpRvy#C&-_`sd!|u1&Gh3b zxiZf4FKbLh*2~7ZL CljEBJ literal 0 HcmV?d00001 diff --git a/MyTracks/res/drawable-mdpi/menu_stop_recording.png b/MyTracks/res/drawable-mdpi/menu_stop_recording.png new file mode 100644 index 0000000000000000000000000000000000000000..20df415869bf4c224f577abc6fc30f107cada685 GIT binary patch literal 1047 zcmaJ=PiWIn9L}7ZI-QPzIEBe0lYwB9ye`>HSlrsCb%kZjuDTvPEKT0lu;tH^SKIYs znNAoCPYT1Uf{LJ`M-L7}QM@Xs$DL%Cfrxkz>r2;m9;|_v_uh~1`+k4l>g2@v&W;lu z6h(C=$CMP=L9q6>lfPdoeJ9&-9M9k>XBHPU4^a`r$s&-nv^kVQnz6L_4h>UO>nSsx z!5MX2(jAM@0t{2MT*9WP;gO=N>GKGKESfWIncjZ!k_M(B)6;^=scsDA%(0S(rb-iO zy)>_j20d~P3>PILU?Hr5qP1ZAQcx)M1DW|jt32%eYeouD%6B#1d40s_N@bZ!uW zL7ss;C-UMM5auAq!Z6DXg&-#hLlOr;?W2h|&zO}`N}}eA++;e3u`97`p-^B71B~O% zu}~C6mJ74taEKs6{*sNgV#xOU>Iw?-bDVAp)Ur+<%QT5}Ck4xG$l89bOr&6J zQFB?ya6w9SpsM~KYFQ1mk5gzj-hT@F=_MDjDdanOPbZC=?F(GFQp`gdcD%IXEYzzw znRBq?=NuQrrUV88Rntv7uv8hUDkW_nYqpM(icAv?#xxCy6XU{Jo`*sdauCL$$U`yC zM`MwM0EhS}taBAd&s)gGb*{0?4L9Wm!(h3@vw}SH3NjL&V}WYYlG!wtfkaci8rNtZ z3)hs(l3>`NwSTp`ZX)v&92@sco)o9SVB6-^(Q*5dcD?kC@7nJF*aF_`<)24Z4wpYip0)mtgzkT6;hvA( zT(0ESFPEn)Ii@GS@t`%)%Wah}>^rp8exR?r|5z7)ZDsW9Q*iO&Eq-kM?c#=c@6BG} kj`8W}+K)AY-Rz~hW~lBby{BW3UdzE#O~xmb$I+SPKUWG$(*OVf literal 0 HcmV?d00001 diff --git a/MyTracks/res/drawable-xhdpi/menu_help.png b/MyTracks/res/drawable-xhdpi/menu_help.png new file mode 100644 index 0000000000000000000000000000000000000000..243704869415096feda6d981bf0588d5e2aaf807 GIT binary patch literal 1793 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 literal 0 HcmV?d00001 diff --git a/MyTracks/res/drawable-xhdpi/menu_search.png b/MyTracks/res/drawable-xhdpi/menu_search.png new file mode 100644 index 0000000000000000000000000000000000000000..3549f84dd8f5e38665849b46e252bc34f29be027 GIT binary patch literal 2127 zcmaJ?3p8749=`}>v|V&cXT7fIiVk^PBSY|2Yr&=v7ow6Rs?3P)tYO9UbY&YptXLrxq`<;8g@B5$M@ArS6bB_lH z?%ndy?>_cC6SB(G6&(~SQ-pY&KIiL0O0N^7qU1>umoho2|NJ>z0}@`26fXS$!Y;UEMb9iezHJJmQ&F0bjj+o#*9aU z?;w&S3i{WeA{oJ;HzI;TB94IN5L_V8#Tf@V6G+Y^N6?7?5%7=`p5Tgw2xOuwnE-+B zAGF$=h#OB1rTM=1rM^+ni4uvBjK|AlGMwx)93o1;nrZR=!^>O;c6UJUq#;$DF zaAB#T;l97>E*sSPM#W}D*%&vC9?NAupxYHKzlA!#x5!R$$}KEz`?K}h?B51n479y{ zQ?w+-T-{f_$ZXze2L9K&)Yu$QW7O|sondWutk)Q_JN)t9M!T--)21nHt$r5=vLfUe z#a~sbymPXRm$zn0t^*N@y}d^w!HQdfF;iuh84+$H+Z4+ka__aF6WZ>MRwfDAoU*_4 zKAt=6rl=k>E5ha}R?E)6T2N6Nf^OP-%$aH>Bc8h!4HjG5*0h$}RLuF0wJIdU zjbsxQA=8r?J*La4uKG`NBKyje7GpNe$A4*b?~}^!@0p@BU-D}9Y0|DSGj9_&&vy2n zQeDat7d%QfdZnZfB$RpBz3j0+qI>gE4|*|g|5_uvwMYuieyxZbW3|Ym*9t0tEK}11 zgB`JFNiGkc^uC#|FE~5P={}HhaMbF44G_^7>)*O~(scZ=-NEp+E*C;j>-o*bCxDi3 zXOy%zwU#lt!zkoitfTlMMv&ukM11wB<9Ly8m4A7rd4=8VmEuTqCE#F>RMNjFx!hDS z*^3*Aj}bPwVf3_cag!0d1gTf#oDN&Pd_dVdv;*a))ZL!>%mq7^3xp5xV>fH7@?30Q zVZ_0I3ioUK1=0^Dmsa~f=zf0w_-@SpBesVoWKv#w7qz2*hgn81*v0aQExoe8xC}Ud zTF)@Kr5w^Hd|ny~nn#~01FEkQYo=Zk?|RW2wR1u*{x~g|l2$HI8$O*Sc9iaR|5^LT z7z@^tH7CEpE{iyR=lRT`f)Gq&W#>w?$%+474im${sA7G49aR&=5h)*xuKt( zs=lY~A0X2EGC2yz*(%&NQ`6m4sFRdnpWY(BuzLy9{bqK?^RhtY*?v?Rb8IX~Z+jfI z;;~&!>dGdE5QDf>2lR{f*G!oe^^i@6bj6^de z|760+^ec-hFSDPm&usrXosE~R+77^4Qp$9A=Gi&x>XqsJg^B&;MqPy~i!R@{7aI(* zPp*h%eOKpxS5Nuohv%4z8e7tNq)^&ziI^HKVDgG4t07*+q|$&B9LYtwE& zuX8zyz5BF4SJBd78KhXt*r~-u9TxnaihZE<@~dg zf?Taq%d**36IX-_-{`-ie?JGKIv|#fpz>=msy(frIe0zoOg8uRrTKhIv%w?7`7Tcyl|isZ*ecw#u<}mcLbp((0&jng0SYa%AcN literal 0 HcmV?d00001 diff --git a/MyTracks/res/drawable-xhdpi/menu_settings.png b/MyTracks/res/drawable-xhdpi/menu_settings.png new file mode 100644 index 0000000000000000000000000000000000000000..09b01483454788c435acf715c57d92fc0ead0a7c GIT binary patch literal 1641 zcmaJ>c~BE~6yA_XI1DNx4tQ;2tWqJn8xu$(;Yb1`lrR)Bl4(0iNS3f-vN2hb;JJmd z#e)&FR;g4iRmP*XT4ijNk*%drb?kVQ0WT1(fI@*<)JP3>gMj^`bZ2&dzxU>S-@Crq z%^B$_oPh8E001~@l`@k)6TGjVFa14=t!|@_Fd|7uWZ`*)Q*T3oL?fPyf@-tggl3|8 zW6|o1Xe0?b8Cm_^3zKUdEMF{6x| zEz-ams{+l(RBLQ#)|zy!VNHQSV&ulhfw3+rO<+a|J?Jv8ve>0A8Fz$NO5eS1hzpK{ z5Ct;s>!Ng;3{ZjFP*B8&qYQ8~0!9n@h!Bdq!mror(2L8P?@eWuDr~5pz-?L_Uo|$xjC`EH?fJMBRAhAcr8SdB$O)>lSN33P>zgY zmAIkMj9Q2>tnm#NnGow0gV{=FR-!h{ff|!-xEUO2T8d3r3z9S;-ze5NVJ%4Vgjk3! z2J)`lzL5DxWNsL*#xGc<^7H2{+TnJ{ zn9h!qy-js@D_1+Zf@Zt^eugYr>*#8enEC_ni$mkiWVqV)0B@821LruRoDEr&aLy~1 zyB?9b0<;9u46|NoT=ivDSMdve5Or{-s#V3xd64*MQMnUK9!80p9AxYmyS4}rq+OUQAhE&h4 zX#*VHi8_`8yD#tP{AE3r`(r=4ac`lYnAd8VzlGIsx=|A7RwcALd@gl5dIb#qmGh8l z$g$+t!ibEOn>A-WTZufCRb5xU8oK3xBjZy@C zo2@M_tN7_Gr{Z*dd9?EAP++6K3Oatcap%qMA@XqNvfVvQRtvlJPf$0xd61cQr@5@E zcE3fvo~l~3QL?gO3Vf)29uObmUp{kK9@4@N8Db~`N_ab3gp7;2lFo;9FCw01CsUyV zcb)``rtBy^9uMtCmWjxBgBF|^IYf(S*waUKtOwR#oHr;e&-#)rPeNQ(!yZU5Tx9*#J}uSbEWvP~&o4jw^$UnLvcP znb!4*dKE|VI@GPaZs4&|Kgr;NC@GqwsUie{OK27pH3=m6Fo8HoMUgq04McllzFvQn zp&2I5us(*3`=YVPpq~l)qD&pj>rzn#8mwdGZ7kaq>kNZxAkRE7l}kV#G<6lPCe10$ zV+l0nt6}Blu>_l9DHIIlw01|U>nb!qj@TGnbZCq|(9pb_Xt4L3S!qF!Vllx-()P;d zl}Ot&`asKTzI%0O - - - - - - - - - - - - - \ No newline at end of file diff --git a/MyTracks/res/menu/search_only.xml b/MyTracks/res/menu/search_only.xml index 44cd456e8..22d061d37 100644 --- a/MyTracks/res/menu/search_only.xml +++ b/MyTracks/res/menu/search_only.xml @@ -16,7 +16,7 @@ limitations under the License. --> diff --git a/MyTracks/res/values/strings.xml b/MyTracks/res/values/strings.xml index ad5dde84c..32420774d 100644 --- a/MyTracks/res/values/strings.xml +++ b/MyTracks/res/values/strings.xml @@ -966,80 +966,55 @@ limitations under the License. + translation_description="In the menu, to go to the aggregated statistics page."> Aggregated statistics - + Chart settings + translation_description="In the menu, to go to the help page."> Help - + Map mode - - My location - - - Satellite mode - + translation_description="In the menu, to show a list of markers for the current track."> Markers + + My location + + translation_description="In the menu, to start recording a track."> Record track + + Satellite mode + Search + translation_description="In the menu, to go to the sensor state page."> Sensor state + translation_description="In the menu, to go to the settings page."> Settings + translation_description="In the menu, to stop recording a track."> Stop recording + translation_description="In the menu, to show a list of all the tracks."> Tracks diff --git a/MyTracks/src/com/google/android/apps/mytracks/ChartActivity.java b/MyTracks/src/com/google/android/apps/mytracks/ChartActivity.java index cab942bad..fda7566dc 100644 --- a/MyTracks/src/com/google/android/apps/mytracks/ChartActivity.java +++ b/MyTracks/src/com/google/android/apps/mytracks/ChartActivity.java @@ -228,7 +228,7 @@ public class ChartActivity extends Activity implements TrackDataListener { chartView.postInvalidate(); } }) - .setTitle(R.string.menu_chart_view_chart_settings) + .setTitle(R.string.menu_chart_settings) .setView(view) .create(); } diff --git a/MyTracks/src/com/google/android/apps/mytracks/MenuManager.java b/MyTracks/src/com/google/android/apps/mytracks/MenuManager.java index 90480c3ab..f9f624a39 100644 --- a/MyTracks/src/com/google/android/apps/mytracks/MenuManager.java +++ b/MyTracks/src/com/google/android/apps/mytracks/MenuManager.java @@ -81,9 +81,7 @@ class MenuManager { .setVisible(isMapTab); menu.findItem(R.id.menu_satellite_mode) .setVisible(isMapTab) - .setTitle(isSatelliteMode - ? R.string.menu_map_view_map_mode - : R.string.menu_map_view_satellite_mode); + .setTitle(isSatelliteMode ? R.string.menu_map_mode : R.string.menu_satellite_mode); } /**