From c97ae1e87f0e14d0b1222d065f2bf78877cf02a8 Mon Sep 17 00:00:00 2001 From: Jimmy Shih Date: Fri, 6 Apr 2012 15:16:01 -0700 Subject: [PATCH] merge heads --- MyTracks/.classpath | 14 - MyTracks/AndroidManifest.xml | 32 +- MyTracks/libs/README.txt | 29 +- .../commons-codec-1.3.jar | Bin .../commons-logging-1.1.1.jar | Bin .../google-api-client-1.5.0-beta.jar | Bin .../google-http-client-1.5.0-beta.jar | Bin .../google-oauth-client-1.5.0-beta.jar | Bin MyTracks/libs/googleloginclient-helper.jar | Bin 19759 -> 0 bytes .../libs/{google-api-client => }/gson-1.6.jar | Bin .../{google-api-client => }/guava-r09.jar | Bin .../jackson-core-asl-1.6.7.jar | Bin .../{google-api-client => }/jsr305-1.3.9.jar | Bin MyTracks/proguard.cfg | 95 ++- .../res/drawable-hdpi/ic_menu_tracklist.png | Bin 2147 -> 0 bytes .../res/drawable-hdpi/menu_insert_marker.png | Bin 0 -> 1625 bytes MyTracks/res/drawable-hdpi/menu_play.png | Bin 0 -> 1410 bytes MyTracks/res/drawable-hdpi/menu_share.png | Bin 0 -> 1606 bytes .../res/drawable-ldpi/ic_menu_tracklist.png | Bin 1076 -> 0 bytes .../res/drawable-mdpi/ic_menu_tracklist.png | Bin 1458 -> 0 bytes .../res/drawable-mdpi/menu_insert_marker.png | Bin 0 -> 1379 bytes MyTracks/res/drawable-mdpi/menu_play.png | Bin 0 -> 1248 bytes MyTracks/res/drawable-mdpi/menu_share.png | Bin 0 -> 1341 bytes .../res/drawable-xhdpi/menu_insert_marker.png | Bin 0 -> 1903 bytes MyTracks/res/drawable-xhdpi/menu_play.png | Bin 0 -> 1620 bytes MyTracks/res/drawable-xhdpi/menu_share.png | Bin 0 -> 1780 bytes MyTracks/res/layout/mytracks_layout.xml | 19 - .../{track_detail.xml => track_edit.xml} | 22 +- .../res/menu/{main.xml => track_detail.xml} | 77 ++- MyTracks/res/values/strings.xml | 282 ++++----- .../android/apps/mytracks/Constants.java | 26 +- .../android/apps/mytracks/ImportActivity.java | 14 +- .../android/apps/mytracks/MapActivity.java | 197 ------ .../android/apps/mytracks/MenuManager.java | 172 ------ .../android/apps/mytracks/MyTracks.java | 580 ------------------ .../apps/mytracks/MyTracksApplication.java | 7 + .../android/apps/mytracks/SearchActivity.java | 17 +- .../apps/mytracks/TrackDetailActivity.java | 550 +++++++++++++++++ ...rackDetail.java => TrackEditActivity.java} | 20 +- .../apps/mytracks/TrackListActivity.java | 317 ++++++---- .../mytracks/io/backup/RestoreActivity.java | 5 +- .../io/sendtogoogle/SendToGoogleUtils.java | 7 +- .../services/TrackRecordingService.java | 7 +- .../apps/mytracks/util/CheckUnitsUtils.java | 47 ++ .../apps/mytracks/util/PlayTrackUtils.java | 2 +- .../mytracks/widgets/TrackWidgetProvider.java | 7 +- MyTracksLib/.classpath | 1 - MyTracksTest/.classpath | 2 - MyTracksTest/libs/AndroidMockRuntime.jar | Bin 695571 -> 0 bytes ...Test.java => TrackDetailActivityTest.java} | 93 +-- .../android/apps/mytracks/TrackStubUtils.java | 6 +- .../sendtogoogle/SendToGoogleUtilsTest.java | 140 +++++ .../UploadResultActivityTest.java | 169 +++++ 53 files changed, 1445 insertions(+), 1511 deletions(-) rename MyTracks/libs/{google-api-client => }/commons-codec-1.3.jar (100%) rename MyTracks/libs/{google-api-client => }/commons-logging-1.1.1.jar (100%) rename MyTracks/libs/{google-api-client => }/google-api-client-1.5.0-beta.jar (100%) rename MyTracks/libs/{google-api-client => }/google-http-client-1.5.0-beta.jar (100%) rename MyTracks/libs/{google-api-client => }/google-oauth-client-1.5.0-beta.jar (100%) delete mode 100644 MyTracks/libs/googleloginclient-helper.jar rename MyTracks/libs/{google-api-client => }/gson-1.6.jar (100%) rename MyTracks/libs/{google-api-client => }/guava-r09.jar (100%) rename MyTracks/libs/{google-api-client => }/jackson-core-asl-1.6.7.jar (100%) rename MyTracks/libs/{google-api-client => }/jsr305-1.3.9.jar (100%) delete mode 100644 MyTracks/res/drawable-hdpi/ic_menu_tracklist.png create mode 100644 MyTracks/res/drawable-hdpi/menu_insert_marker.png create mode 100644 MyTracks/res/drawable-hdpi/menu_play.png create mode 100644 MyTracks/res/drawable-hdpi/menu_share.png delete mode 100644 MyTracks/res/drawable-ldpi/ic_menu_tracklist.png delete mode 100644 MyTracks/res/drawable-mdpi/ic_menu_tracklist.png create mode 100644 MyTracks/res/drawable-mdpi/menu_insert_marker.png create mode 100644 MyTracks/res/drawable-mdpi/menu_play.png create mode 100644 MyTracks/res/drawable-mdpi/menu_share.png create mode 100644 MyTracks/res/drawable-xhdpi/menu_insert_marker.png create mode 100644 MyTracks/res/drawable-xhdpi/menu_play.png create mode 100644 MyTracks/res/drawable-xhdpi/menu_share.png rename MyTracks/res/layout/{track_detail.xml => track_edit.xml} (84%) rename MyTracks/res/menu/{main.xml => track_detail.xml} (52%) delete mode 100644 MyTracks/src/com/google/android/apps/mytracks/MenuManager.java delete mode 100644 MyTracks/src/com/google/android/apps/mytracks/MyTracks.java create mode 100644 MyTracks/src/com/google/android/apps/mytracks/TrackDetailActivity.java rename MyTracks/src/com/google/android/apps/mytracks/{TrackDetail.java => TrackEditActivity.java} (84%) create mode 100644 MyTracks/src/com/google/android/apps/mytracks/util/CheckUnitsUtils.java delete mode 100644 MyTracksTest/libs/AndroidMockRuntime.jar rename MyTracksTest/src/com/google/android/apps/mytracks/{MyTracksTest.java => TrackDetailActivityTest.java} (60%) create mode 100644 MyTracksTest/src/com/google/android/apps/mytracks/io/sendtogoogle/SendToGoogleUtilsTest.java create mode 100644 MyTracksTest/src/com/google/android/apps/mytracks/io/sendtogoogle/UploadResultActivityTest.java diff --git a/MyTracks/.classpath b/MyTracks/.classpath index 82b4be14d..0ca188f97 100644 --- a/MyTracks/.classpath +++ b/MyTracks/.classpath @@ -1,22 +1,8 @@ - - - - - - - - - - - - - - diff --git a/MyTracks/AndroidManifest.xml b/MyTracks/AndroidManifest.xml index d64f76a7c..6b255feb1 100755 --- a/MyTracks/AndroidManifest.xml +++ b/MyTracks/AndroidManifest.xml @@ -190,28 +190,6 @@ limitations under the License. android:name="android.app.default_searchable" android:value="com.google.android.apps.mytracks.SearchActivity" /> - - - - - - - - - - - - - - - - - - @@ -244,9 +222,10 @@ limitations under the License. android:name="android.app.default_searchable" android:value="com.google.android.apps.mytracks.SearchActivity" /> + + android:label="@string/track_edit_title" + android:name="com.google.android.apps.mytracks.TrackEditActivity" > @@ -257,6 +236,11 @@ limitations under the License. + + + + + diff --git a/MyTracks/libs/README.txt b/MyTracks/libs/README.txt index 0df5b07bb..20bcb1ded 100644 --- a/MyTracks/libs/README.txt +++ b/MyTracks/libs/README.txt @@ -3,10 +3,21 @@ own licenses, which allow their usage for the My Tracks application. Any other applications that wish to use these files should consult the appropriate licenses or the JAR's authors. -google-api-client/ -- see http://code.google.com/p/google-api-java-client/. -- contains Google API client library, google-api-client-1.5.0-beta.jar, and its - dependencies. +Android Support Package: +android-support-v4.jar +- see http://developer.android.com/sdk/compatibility-library.html + +Google APIs Client Library for Java: +commons-codec-1.3.jar +commons-logging-1.1.1.jar +google-api-client-1.5.0-beta.jar +google-http-client-1.5.0-beta.jar +google-oauth-client-1.5.0-beta.jar +gson-1.6.jar +guava-r09.jar +jackson-core-asl-1.6.7.jar +jsr305-1.3.9.jar +- see http://code.google.com/p/google-api-java-client/ - google-api-client-1.5.0-beta.jar depends on protobuf-java-2.2.0.jar, however, MyTracksLib already includes protobuf-java.2.3.0-lite.jar. Thus using the newer version, protobuf-java.2.3.0-lite.jar. @@ -14,9 +25,9 @@ google-api-client/ some of its classes are already included in the android framework, thus not including xpp3-1.1.4c.jar. -google-common.jar - -googleloginclient-helper.jar - +Google Analytics: libGoogleAnalytics.jar -- see http://code.google.com/mobile/analytics/docs/. +- see http://code.google.com/apis/analytics/docs/mobile/android.html + +Others: +google-common.jar \ No newline at end of file diff --git a/MyTracks/libs/google-api-client/commons-codec-1.3.jar b/MyTracks/libs/commons-codec-1.3.jar similarity index 100% rename from MyTracks/libs/google-api-client/commons-codec-1.3.jar rename to MyTracks/libs/commons-codec-1.3.jar diff --git a/MyTracks/libs/google-api-client/commons-logging-1.1.1.jar b/MyTracks/libs/commons-logging-1.1.1.jar similarity index 100% rename from MyTracks/libs/google-api-client/commons-logging-1.1.1.jar rename to MyTracks/libs/commons-logging-1.1.1.jar diff --git a/MyTracks/libs/google-api-client/google-api-client-1.5.0-beta.jar b/MyTracks/libs/google-api-client-1.5.0-beta.jar similarity index 100% rename from MyTracks/libs/google-api-client/google-api-client-1.5.0-beta.jar rename to MyTracks/libs/google-api-client-1.5.0-beta.jar diff --git a/MyTracks/libs/google-api-client/google-http-client-1.5.0-beta.jar b/MyTracks/libs/google-http-client-1.5.0-beta.jar similarity index 100% rename from MyTracks/libs/google-api-client/google-http-client-1.5.0-beta.jar rename to MyTracks/libs/google-http-client-1.5.0-beta.jar diff --git a/MyTracks/libs/google-api-client/google-oauth-client-1.5.0-beta.jar b/MyTracks/libs/google-oauth-client-1.5.0-beta.jar similarity index 100% rename from MyTracks/libs/google-api-client/google-oauth-client-1.5.0-beta.jar rename to MyTracks/libs/google-oauth-client-1.5.0-beta.jar diff --git a/MyTracks/libs/googleloginclient-helper.jar b/MyTracks/libs/googleloginclient-helper.jar deleted file mode 100644 index 6e610e991f742e189b4fa76fc76841feedb064ea..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 19759 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 R%^wB^At3w*WJ$Y$cmR; } +-keep public class * extends android.view.View { + public (android.content.Context); + public (android.content.Context, android.util.AttributeSet); + public (android.content.Context, android.util.AttributeSet, int); + public void set*(...); +} + -keepclasseswithmembers class * { public (android.content.Context, android.util.AttributeSet); } @@ -47,6 +46,11 @@ public (android.content.Context, android.util.AttributeSet, int); } +-keepclassmembers class * extends android.app.Activity { + public void *(android.view.View); +} + +# For enumeration classes, see http://proguard.sourceforge.net/manual/examples.html#enumerations -keepclassmembers enum * { public static **[] values(); public static ** valueOf(java.lang.String); @@ -56,20 +60,55 @@ public static final android.os.Parcelable$Creator *; } -# Needed by google-api-client to keep generic types and @Key annotations accessed via reflection +-keepclassmembers class **.R$* { + public static ; +} +# The support library contains references to newer platform versions. +# Don't warn about those in case this app is linking against an older +# platform version. We know about them, and they are safe. +-dontwarn android.support.** + +# +# Section 2 +# Google APIs Client Library for Java proguard settings. +# + +# Needed by google-api-client to keep generic types and @Key annotations accessed via reflection -keepclassmembers class * { @com.google.api.client.util.Key ; } - -keepattributes Signature,RuntimeVisibleAnnotations,AnnotationDefault # Needed by Guava - -dontwarn sun.misc.Unsafe +# See https://groups.google.com/forum/#!topic/guava-discuss/YCZzeCiIVoI +-dontwarn com.google.common.collect.MinMaxPriorityQueue + +# +# Section 3 +# My Tracks specific proguard settings. +# + +# Add the libraries, but ignore warnings about them +-libraryjars libs +-libraryjars ../MyTracksLib/libs +-dontwarn com.android.common.** +-dontwarn com.google.android.googleapps.** +-dontwarn com.google.android.gsf.** +-dontwarn javax.servlet.** +-dontwarn org.apache.avalon.framework.logger.** +-dontwarn org.apache.log.** +-dontwarn org.apache.log4j.** + +# Make our stack traces useful +# Line numbers will be correct, file names will be replaced by "MT" since the +# class name is enough to get the file name. +-renamesourcefileattribute MT +-keepattributes SourceFile,LineNumberTable + # Keep services needed by ANT+ protocol -keep public class com.dsi.ant.IAnt_6 -keep public class com.dsi.ant.IAnt -keep public class com.dsi.ant.IServiceSettings - diff --git a/MyTracks/res/drawable-hdpi/ic_menu_tracklist.png b/MyTracks/res/drawable-hdpi/ic_menu_tracklist.png deleted file mode 100644 index 68338297b5b7ee6a274ce26cb3de84ef67a1b797..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2147 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 literal 0 HcmV?d00001 diff --git a/MyTracks/res/drawable-hdpi/menu_play.png b/MyTracks/res/drawable-hdpi/menu_play.png new file mode 100644 index 0000000000000000000000000000000000000000..df8a2ca28e1e3978a59dbe9cf415a59429357084 GIT binary patch literal 1410 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 M07*qoM6N<$g7_=H{{R30 diff --git a/MyTracks/res/drawable-mdpi/menu_insert_marker.png b/MyTracks/res/drawable-mdpi/menu_insert_marker.png new file mode 100644 index 0000000000000000000000000000000000000000..de9a29e7cdc204914c6757a7e6fcd8875b5d1565 GIT binary patch literal 1379 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(#^lGsVil*vZt`*}%Zm$G&eP`1g19yq1O?*YRb4+)~5jLR@ zJ=R+iyjDG|V!h%qJ#_g)-@cU(swMuc6PlRiWFI7WrSI+nsl|Eso9q_0?VPhc!%aJ> zev$)cRp8RR*_svoQzGK`hL_Dyti8xO|8j0bhh@qmPWMX*qGAW_#Y$UsW=`&w%CYiX z;LsF*^62S}8pZE@Q~M{rwdgf1S-{C2QMQZw)0UHtx)TxwYs8Fi6;AzQ8aLqTuA$rvWHQ%R(tl_eD`gZ2Fw3CD zY)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(#^lGsVil%*epP$->gq$G&eP`1g19yq1O?oUQlAlEdbi=l3J8mmYU*Ll%J~r_Ow+dZnv1@ zG!Lpb1-Dx)aO%|uIz}H9wMbD769T3m5EGtofgE_!Pt60S_ab1z_LS;2W?*0p@^oU1PZ9MzCuS-Z@1@eQA(D8tnc61wVVaLqcBX29V# zIWsfCC{pB#;hbN;Y=1mG{NVSVChH#?3JPqh|LrZGSga@d$!j@N{9T4gOd3khts8O< z?X^rPXb9`z;YkuzpTR45fIZHj&o?BH>tajpOh?&liEZx)I}SJ}I5=yUdI zwcx(@vCZ>MBKP9@Zw9BTD$?TGZ|G+IGUZf=3##35+)i(c`JQwIC;NGYYfAs7gf=z( zd%E<}-7T*g=REtzXT4)%)}bwz{w}bZpZ#W!zhlhvxU=Q4`JVk@$q@kz*H;xE&f-7v zoz3Lf+=R;*m_w)X*Ww_78!_em8^&}%-Jpxqbc)I$z JtaD0e0syqNvA+NS literal 0 HcmV?d00001 diff --git a/MyTracks/res/drawable-mdpi/menu_share.png b/MyTracks/res/drawable-mdpi/menu_share.png new file mode 100644 index 0000000000000000000000000000000000000000..056deb57b92875e9361c4ee2a769023e55aec274 GIT binary patch literal 1341 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+1$*~)y&z{$-vFf(ACh=#L&{!#L3yw z&D7A`#K{n**Cju>G&eP`1g19yq1OecUQlAlEdbi=l3J8mmYU*Ll%J~r_Ow+dHn%vr z8k-scF;2HY^rm2Q3q-F8PQCg-$LNEi7AdM>LcsI`V!{(HkONQpsd>QkUIa|oY=Ude z85kJXd%8G=RNQ)V-Cn~rQR4W=>Iwg!+|Ni*WNYr69dv4uOJs^bv(n~+4rZxFnoD?6 zl6HFG>y>EV?T>6lD9{=aW!tiT&*Nv0Zd_AabLq(3ibHBr0Sz_)S7gB_S8S&CY@E#&-=7Qv+6>((cSq+1C{(AiaT&F`>J(+ z%d+he?%Jz1F7DjEe^Xr@V^4wr|2)~ePk($~O9mB$c@+lie7)~X%K8~c?yY~{R(&e= zeZH?(?;_jCgTHwi(z6vN-rT zr3rcnEsPWt6)EuvBxF;`l!s|(ikf1Y(kL={bhJAXt8=1z&b|Nt_nq(e``+iSOG=F6 zc}?(Qu~@wLS&C%ljCQ_UcjjA#XLd5jE3{HWrw|4@2c`+7y+I?e8wB4H;9uJ zvCn-ml9X?xX;KV9IXO9CP8di~X%He3i6A%>3Jn!776OaSOrutT*)nCAL4jFx6i(7O zVFsLxsFuj0rFk}(UBMd_Hv8KyX0kzzT8p)^6M2_j>-ib+O-CM-sR1mr2SPzfk(sM;Ax=WV_=WHs~qrcI|+T3 zeZKG6x#hsB-OY2-UJtwU41Xf`F*l5pPu1TC=b}`E- z23-->j8Zi5NRL16hj2EsJ)#5e@8ZsF^lbH^*=q`lQl}cjes>>ebGewGBJ)iZ9_MHQ zo80a0qz<<)+~?(M$??T2E~*E2N7l1uG=|hY&HOm-=V$MbJf8|%b#K_6Mj0GXC?f&K zz}{7FZdo>d1@zmhIN9u#hh+k8*reTysEJW4dAktf>ej%MxoK-!nzL-)RZR~8?&u1o zU(ofzkGD%4-la`%@4wnKo0GvgZ|pBw_avclNfP#}w1o?7zscRcGW(^qaPr-N5c^g? z*P3PhceQVPy}z}1HhZd)cMpvcW%R2*yv^?5yw??ze>?TnhyB^H_Xlr9Z14}7UY0jr z-;K?GP{pG9#PGV0cA}{0`m5xG>zo@6wRwe(oJ!jvAIYAYYENLtHII9hq*Qkr{r$<= zro}bw1zo)*14}=*O^dJc@45=~yf&Rm$>)CR_)1u9&R81tWYdX7$4ILu{bM5v7qJg* zUHYxPulM~k*83H#{@O>ylU!#VEjRz#vs#iT^$tnrmU#H~cpc5ZV3?t-(?*BiIC7j3cx=-werg1%WNtLGPHeVjL>u*9{0)H?qxHeVDr1p4N|j(`Gm@xl6LkelYQyeP%M$ zL5w-SAdGiGm88=}G%uV{pR~antW)_!#o9He+pqr8byrirbFFtEz3jsU8yyGABm3H2 z#@02Anl!C!>6Y%S!q#`I2isiqH7APaNxt;T^zJ)bvZZ@f+8WQ62iuP9tjY7UZ_`$+ zXxWo^^Wvk{?E&Dq!6_X*wF7pSv4Y8ls6%tDPfK`3c{@_(gj6mPr?2OnTD&5#HgDtd z-sv4>&XX05)ny$@M;ucVInO(Qx|{nj3a%U{d2$P97_km z{hZ?VYd<{QB*{B`?=&_)|3>O+-?DzbxXJv{?ZBdhq#x_~>mUsKLsV7xL>Q5}<7@F$C5=dAz$ literal 0 HcmV?d00001 diff --git a/MyTracks/res/drawable-xhdpi/menu_play.png b/MyTracks/res/drawable-xhdpi/menu_play.png new file mode 100644 index 0000000000000000000000000000000000000000..51124993df109972aa504c796b17e788a3ed0efd GIT binary patch literal 1620 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=k|nMYCBgY=CFO}lsSJ)O`AMk? zp1FzXsX?iUDV2pMQ*9U+m{l@EB1$5BeXNr6bM+EIYV;~{3xK*A7;Nk-3KEmEQ%e+* zQqwc@Y?a>c-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=8sgs4Ho0GGtlc9m3p{t>#iJ_&diIcOV zo2j9>iIX8ruSMv>2~2MaNUxcZfrXQW5l+3J#E@G6wAm%KD6=dz#jPkmR{`v4 zt4!Q(al~mJRBsA4w?O>igj26R&@uX;s6~oum=G}ifSB-v3*^9)erg^ty%zx!_J7lB zJq!#?$2?seLn>~)neFc(k|=R3y~IRxAy0_LE)F>!F0O^mac8{6Tbo`8$hrvHlxTc; zbd;}@OFt>C-t=oiy@J4QmaD4#K@|axUzVx4$wejIUVHb>+scoU5iEzN6_%&nd*3X7 zT2Aa)^|!zGzE|F#x$*MLElVp!BTh{hJiw8_V!$N9*u&t~@IUIfLudp`!KNR+?5+~b zn-ij=S*A1>KaktO>z5&{!1`!`Kn%;{1;R2Hr?IGhS^U6Y2d7-KSVHz{rgZ|P5BMb5 z(htvJ`5skRXV!E%LCS_Xe#=h=!9^l5sY^4MQ*ZTLkQZQfcQmiynq_L`DELU+g7w!y zh2mB%?K#gjPDr_VBl)D*C6Wqc0;w!k+|(f_IFM!UHk2{jYG>1&uHD+qZ&I{_%fwCR5V?9cO2amDSu7o z!}_TS!Kx=e@>CrDvq9_|$BkN@q&>$@C$N-M=B{ow5cUb|@G6-5xt%*Mwt7O_B2KPA z?srX$)BH`DQn(aPezKXpCaxf6GQ-T{PV4?l%}BUi8`RCPP`~;2&&OU8tdm4iKW$m) z+K^P$^8JD0jO#*-NB7)Q{m^kX*z2%h!QoorJxM!`n>=CQ{2Y|`?WtpA;_>4T^|IM) z80K#cX;jLqyLn4;rMK{xXlKbSH=pD*UeBpflB#Jq%cB0R?9{2l9y;@xEO@^AuX%19 zHD|$`V#(6An`TZdmb;qJdbgl|L*+!q7v;Qr8+I3FCfY|>e`lPw#l)Ge`{PEb+uj5(S zW_r*6*i}r_{yi(7k;~{%Y|U?hi0w?fHVHb!++HI($vyS0&ONEg&s(0}`)97ra@uVD nSgTe~DWM4ftV38} literal 0 HcmV?d00001 diff --git a/MyTracks/res/drawable-xhdpi/menu_share.png b/MyTracks/res/drawable-xhdpi/menu_share.png new file mode 100644 index 0000000000000000000000000000000000000000..15549b04eff0aaf80ecd4f5989785bd8bcb1d5fa GIT binary patch literal 1780 zcmaJ?c~BE)9NmO+j!-OM6)g=xDM*ve2__~8Bmq(h#c+s%l8|g*3&}3YB0-=6K}56+ z9z{hIv#Rb$5CMW6Di5eYO&nHjma`Cxw8zhsaAXoyQ z{648jNeD@RXdx1tN~0)fo^+BYi%MtFI4sVWBnFL61L+Kq=0%~?xNI*jjZT_=$aplZ zQpJ@D{ikE$D?T|M!%!{=rlh1$QH8AY=&Y1zcw`}@g*QP;e=VXWO%=_B=g!4%PQ7Waa_(FNb88x?_#jN!q4eoa>ZtMo1*Z};#sKi3wFn#Z{;;1~ynuXUUII4mh zc}K(wSFJ~V&S+*{qs5+G=Enm4oLWs%C(6osqtC_%zTL9t1*5%A$a91D2OcOP?+apf zKpo@no-`fo8(DI$yYSp^y-!cXgm(R|8=r{jU*8W!{4$XNwijuMD+nb(Fz`jDU9+X^ z=G$yo#;7t~Hab5Y$PnAg=siHOdv4FCcWg$8{Skz#Stc_6LUBMwexaG^sQnVcbG4n! zeuY(cwo`6KeT{Qzn)x^y73tFK{a2`S>$S|Zfx;&TY*Pr1SHij7r}cq0m9pXGF@*)M zpMWMW9e%!C(*8|%=CSG+9HL_MJ-V45&%Vf^F z#*PJrl(D-HSu4yFO%sNKyzP4p>&((kR{HLPi8q0RSNuo*j;^{pcED`4K{#fCE-7KV z6R#SE%N&A$re<0NlVcLhtbJ~tY+uo|^TFWtMX2yeDGrV8=BL-qsqsmFOstp(p|@Ih2)-~-1pv5@G2TQ{_?cpp2PSV-pYNcmk)Q2nl;8A zpX|SPKQ|H~Vrol6+mHH%d=mk>^fm&g9#eo0mN6dt_f-Q|;m^Aw*=` z9dT|g9e*8{n_=?V?U0h%0bX58e_DkFtq4|m4uzk*p8n^EEYjKI+m^+Hlc#!#=e3Nk z$~DCmsXwm%ddrSD;mMQ!56<1Vl(nv8cirUMPev*Sd(k15;5**0Snu6=UFC5GAfmVc zSa*wJXV2}sXmQ84QtB90cAXdx?q3){h<3!b7J6*mzI}cDI>{ZjKjP3)+4t>e;eWNa-2df%z48>gJU&FD*_dZp_K|2;bwV zI7}HvnI8)d(I`oqj|9tMM-E5~`vQN>N zf!pR*IByi-G3#ye)(?VT<(saBq8hUrfbI3m7kk#ftEI9GwyRsA$Ia#9Vk_5F%S%+G n&8O9J;3M?C*E9F`AOthOrR959nu@X4_#YCBf`zC2WZC}!HVLh* literal 0 HcmV?d00001 diff --git a/MyTracks/res/layout/mytracks_layout.xml b/MyTracks/res/layout/mytracks_layout.xml index 203d0636a..20fec4b55 100644 --- a/MyTracks/res/layout/mytracks_layout.xml +++ b/MyTracks/res/layout/mytracks_layout.xml @@ -59,23 +59,4 @@ limitations under the License. android:minHeight="80dp" android:layout_gravity="center"/> - - - - diff --git a/MyTracks/res/layout/track_detail.xml b/MyTracks/res/layout/track_edit.xml similarity index 84% rename from MyTracks/res/layout/track_detail.xml rename to MyTracks/res/layout/track_edit.xml index fe4f4ed10..6598a5d92 100644 --- a/MyTracks/res/layout/track_detail.xml +++ b/MyTracks/res/layout/track_edit.xml @@ -35,7 +35,7 @@ limitations under the License.