From 6848a7a475f516c8c6c0443f6fc8f9e107c8d346 Mon Sep 17 00:00:00 2001 From: youtaol Date: Thu, 26 Apr 2012 18:59:06 +0800 Subject: [PATCH] Merge heads --- MyTracks/AndroidManifest.xml | 26 +- .../res/drawable-hdpi/menu_show_on_map.png | Bin 0 -> 1574 bytes .../res/drawable-mdpi/menu_show_on_map.png | Bin 0 -> 1360 bytes .../res/drawable-xhdpi/menu_show_on_map.png | Bin 0 -> 1866 bytes .../res/layout-v14/marker_edit_buttons.xml | 25 + MyTracks/res/layout/marker_detail.xml | 162 ++++++ MyTracks/res/layout/marker_edit.xml | 86 +++ MyTracks/res/layout/marker_edit_buttons.xml | 25 + MyTracks/res/layout/marker_list.xml | 34 ++ MyTracks/res/layout/marker_list_item.xml | 41 ++ MyTracks/res/layout/mytracks_marker_item.xml | 61 --- .../res/layout/mytracks_waypoint_details.xml | 499 ------------------ .../res/layout/mytracks_waypoints_list.xml | 52 -- MyTracks/res/layout/track_edit.xml | 28 +- MyTracks/res/layout/track_list_item.xml | 24 +- MyTracks/res/menu/marker_detail.xml | 33 ++ .../menu/{search_only.xml => marker_list.xml} | 10 +- .../res/menu/marker_list_context_menu.xml | 33 ++ MyTracks/res/values/strings.xml | 176 +++--- MyTracks/res/values/styles.xml | 112 +++- .../android/apps/mytracks/ChartView.java | 6 +- .../android/apps/mytracks/Constants.java | 12 - .../android/apps/mytracks/MapOverlay.java | 5 +- .../apps/mytracks/MarkerDetailActivity.java | 166 ++++++ .../apps/mytracks/MarkerEditActivity.java | 226 ++++++++ .../apps/mytracks/MarkerListActivity.java | 282 ++++++++++ .../android/apps/mytracks/SearchActivity.java | 8 +- .../apps/mytracks/SensorStateActivity.java | 2 +- .../android/apps/mytracks/StatsUtilities.java | 3 + .../apps/mytracks/TrackDetailActivity.java | 60 +-- .../apps/mytracks/TrackListActivity.java | 60 +-- .../apps/mytracks/WaypointDetails.java | 178 ------- .../android/apps/mytracks/WaypointsList.java | 320 ----------- .../DeleteOneMarkerDialogFragment.java | 63 +++ .../DeleteOneTrackDialogFragment.java | 6 +- .../apps/mytracks/fragments/MapFragment.java | 50 +- .../mytracks/io/backup/RestoreActivity.java | 1 + .../apps/mytracks/io/file/CsvTrackWriter.java | 10 +- .../services/TrackRecordingService.java | 7 +- .../apps/mytracks/util/StatsUtils.java | 159 ++++++ .../content/WaypointCreationRequest.java | 14 +- .../content/WaypointCreationRequestTest.java | 3 +- .../services/TrackRecordingServiceTest.java | 4 +- 43 files changed, 1658 insertions(+), 1414 deletions(-) create mode 100644 MyTracks/res/drawable-hdpi/menu_show_on_map.png create mode 100644 MyTracks/res/drawable-mdpi/menu_show_on_map.png create mode 100644 MyTracks/res/drawable-xhdpi/menu_show_on_map.png create mode 100644 MyTracks/res/layout-v14/marker_edit_buttons.xml create mode 100644 MyTracks/res/layout/marker_detail.xml create mode 100644 MyTracks/res/layout/marker_edit.xml create mode 100644 MyTracks/res/layout/marker_edit_buttons.xml create mode 100644 MyTracks/res/layout/marker_list.xml create mode 100644 MyTracks/res/layout/marker_list_item.xml delete mode 100644 MyTracks/res/layout/mytracks_marker_item.xml delete mode 100644 MyTracks/res/layout/mytracks_waypoint_details.xml delete mode 100644 MyTracks/res/layout/mytracks_waypoints_list.xml create mode 100644 MyTracks/res/menu/marker_detail.xml rename MyTracks/res/menu/{search_only.xml => marker_list.xml} (72%) create mode 100644 MyTracks/res/menu/marker_list_context_menu.xml create mode 100644 MyTracks/src/com/google/android/apps/mytracks/MarkerDetailActivity.java create mode 100644 MyTracks/src/com/google/android/apps/mytracks/MarkerEditActivity.java create mode 100644 MyTracks/src/com/google/android/apps/mytracks/MarkerListActivity.java delete mode 100644 MyTracks/src/com/google/android/apps/mytracks/WaypointDetails.java delete mode 100644 MyTracks/src/com/google/android/apps/mytracks/WaypointsList.java create mode 100644 MyTracks/src/com/google/android/apps/mytracks/fragments/DeleteOneMarkerDialogFragment.java create mode 100644 MyTracks/src/com/google/android/apps/mytracks/util/StatsUtils.java diff --git a/MyTracks/AndroidManifest.xml b/MyTracks/AndroidManifest.xml index 957e1a058..fc256591d 100755 --- a/MyTracks/AndroidManifest.xml +++ b/MyTracks/AndroidManifest.xml @@ -171,6 +171,15 @@ limitations under the License. + + + + + @@ -204,23 +213,6 @@ limitations under the License. android:name="android.app.default_searchable" android:value="com.google.android.apps.mytracks.SearchActivity" /> - - - - - - - - - - - - - diff --git a/MyTracks/res/drawable-hdpi/menu_show_on_map.png b/MyTracks/res/drawable-hdpi/menu_show_on_map.png new file mode 100644 index 0000000000000000000000000000000000000000..01e10e03499651337b6ab7f621266dd1735d3ad4 GIT binary patch literal 1574 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#nIB-(aqJ=$-vFf(ACh=#L&{!#L3yw z&D7A`#K{n**Cju>G&eP`1g19yq}SEZ&CJZu5vN{IV#qB3+U$~Alv$RV;#QQOs{r=2 zRVHq?IO8-Asy79jTOj^$!Kqgt=oo!a)FMSSObD2MKumbT1#;j?KQ#}S-iv?9v6SuSzs|I+iBA8!Uy|4G*ABgSLXir znwVI{mgLP#Wlrk~PT=rhiO74&@aqk`zk~dX)O(sgn9Cd$*D>3afuzO&GS#U-ehDy zBh7Mn!K$O~owX>eV*-S*(~z#Dfc(SODh`EVpiN2*kb9I z5-O}VWBW;~Ra0+ zRs7EV<5?_qyVaDA?sF2Kz%Cng&)$GB?#G;KkJl`g&)UDp;zZklO^^IunZ5e-XxrgE z=?_*WN`Dpm(7Wkro0vrssUV;%uKkC(gaHUE0Hm5aLbc%1@qBtX8etXTar?wwvOrFR;^S|kt(k7#yrn~7I1|7=R#_0`d6D y=R4?TFxoeZJy84q!jDCTNr8ih{Z?k5AN^VbAKbLh*2~7Y^#a(9r literal 0 HcmV?d00001 diff --git a/MyTracks/res/drawable-mdpi/menu_show_on_map.png b/MyTracks/res/drawable-mdpi/menu_show_on_map.png new file mode 100644 index 0000000000000000000000000000000000000000..353a266b358c01d3b2d8fc8210092bcbc2be033d GIT binary patch literal 1360 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(#^lGsViy)zHn%%+STu$-vFf(ACh=#L&{!#L3yw z&D7A`#K{n**Cju>G&eP`1g19yq1P3sUQlAlEdbi=l3J8mmYU*Ll%J~r_Ow+dZnrq$ zG!Lpb1-DzAaq86vIz}H9wMbD769T3m5EGtofgE_!Pt60S_ab1zesy7IA_D{CAx{^_ zkcwMxrdxY6JBqZXo9>d@8hAvhH9^wxLe$1f*W9=R|2Osa+8^{25X%-7OqzPkO{Xbi zr9#t!M8^(So{0@jfx_2~3z()09J%XL#$Eg{IsaMZv(ogW%6ZEdZQ&E$xRvz?(=}

aSj#=qen4dG#A> zT7}S*8B;T#X-+#kQ>5UeZ`w!ebEWgu`7Wo-OLE57)V(TVN9Y!_JHcwBP*Oj^{v{A5RYm0yc0A1&*?=+B<1v7$l9;`xc( zUrRU4Pf6d?w)%^6?IcaRgY#PDcQMEcZa%~x+pul-inybur`>cPY>Q+J`@R3+e(?{= a2N-7FEMmBMJ5?Q2#(BE>xvXc-mj#PnPRIHZt82`Ti~3Uk?B!Ylp0*+7m{3+ootz+WN)WnQ(*-(AUCxn zQK2F?C$HG5!d3}vt`(3C64qBz04piUwpD^SD#ABF!8yMuRl!uxKsVXI%uvD1M9IxIyg#@@$ndN=gc>^!3Zj z%k|2Q_413-^$jg8E%gnI^o@*kfhu&1EAvVcD|GXUm0>2hq!uR^WfqiV=I1GZOiWD5 zFD$Tv3bSNU;+l1ennz|zM-B0$V)JVzP|XC=H|jx7ncO3BHWAB;NpiyW)Z+ZoqGVvir744~DzI`cN=+=uFAB-e&w+(vKt_H^esM;Afr4|esh**NZ(?$0 z9!LbN!`Ii!Gq1QLF)umQ)5TT^Xog;9W{Q=Yi=(Bvqno3tlYyI|p{t>#iJ_&diIcOV zo2j9>iIX8ruSMv>2~2MaLa!4}y`aR9TL84#CABECEH%ZgC_h&L>}jh^+-|YJ zX&zK>3U0Sp;?%1Tbc{YIYLTKECIn1BASOKF0y*%cpPC0u??u3b&HJmN9++SDc)B=- zRNQ(q`)szbqr|bznU_?u7A9$i2~JrgC(=?iA1OQg6rqm`)z4q0v_bv-_MkZprx4x@CX9k*Sxeu9{e`67nh2Neq#a*|#f zKYs2g=+kWYfn!ftpr-S|kR8Hv9vxoK-dz)sm{xH3l4|e+aaWJ#{yMP-96K0p9gyFb zxn9?pv#!DW!9ICbi*xPb`K6gt?PfVL#;}_IHQ|zB7O&hB(l}qWtiSlnOKwJ&O|Lhq zZ1+0*<)ZWbTigX~TXyZKY!353Gdx93ToD` zbvD~n%S=4sX7fWb@n%t}wvpTHKBg_rVx0_1nYE7>9Y4EC=eCOAg4T^&gdeC!O!%R* zF><-h55v<_Rlde1=)7eS$j|e8WPE=6wWo$Nw|N(NPBGkM#Wf-Ea<6sIWA%e&?DEkE zIrZkGEWQ?g?2=!@^9Q}n=b4Ouq;9yc7Bc5~)z0t<w|LV*#7T2qwE*_X3@IS53?UAOrAP9Li2XpiAATKJ0+iKSgih?$VwSOS3YOE``!A;7;$MBRu%P?w&Zub%&KK^_>G;yjnU@`!<@xK?_se|&eK+mG zA2w;HeSRv^J3jx@gM2>B zi);VcqR%2=#<{L|hOv#=U#0gm*OWdDsg;ps>$fdyRXNSKdc_PaMi*nb4+f4#>Nd<< z^M0*jHBk3R*4wFY(CG0ht);)dGdd^437MbDcGl8f64f9cbNaZ-S^L9AyxI*ngew$o znsk1SS~!u_Alh-;nKqBGueaAvXL!GJN9MNNNj@K<4s$EKiA;G~?(oe0V(PqZ7T1RM zGe4Fwe6|snU_5gCtpCKR{qnvx^Ef9lBwhc``Mb`z|Fffz!;R>Z8-u#91~zDVZ=TP! zh#_h3|GPyp7K|>>=5Ll^_hU%hT-q03&iL+HG=uV=+c5`pMHCS5z&HN}Mus_gPxk+F Ss@n{z-8^0WT-G@yGywo%h|Y!p literal 0 HcmV?d00001 diff --git a/MyTracks/res/layout-v14/marker_edit_buttons.xml b/MyTracks/res/layout-v14/marker_edit_buttons.xml new file mode 100644 index 000000000..dd1583d6e --- /dev/null +++ b/MyTracks/res/layout-v14/marker_edit_buttons.xml @@ -0,0 +1,25 @@ + + + +