diff --git a/.hgignore b/.hgignore index 3bf9706a8..1bbe85f92 100644 --- a/.hgignore +++ b/.hgignore @@ -5,3 +5,4 @@ syntax:glob */proguard/** .metadata MyTracksTest/annotations.log +MyTracks/src/com/google/android/apps/mytracks/io/mymaps diff --git a/MyTracks/.classpath b/MyTracks/.classpath index 636d59be6..72de4ae42 100644 --- a/MyTracks/.classpath +++ b/MyTracks/.classpath @@ -8,6 +8,7 @@ + diff --git a/MyTracks/AndroidManifest.xml b/MyTracks/AndroidManifest.xml index 51487fe03..e618828c3 100755 --- a/MyTracks/AndroidManifest.xml +++ b/MyTracks/AndroidManifest.xml @@ -17,8 +17,8 @@ limitations under the License. + android:versionCode="25" + android:versionName="1.1.2"> @@ -56,6 +56,11 @@ limitations under the License. android:label="MyTracks" android:exported="false" /> + + @@ -122,6 +127,7 @@ limitations under the License. + @@ -158,14 +164,15 @@ limitations under the License. - - + + + diff --git a/MyTracks/default.properties b/MyTracks/default.properties index 8a7ac55df..061e30159 100644 --- a/MyTracks/default.properties +++ b/MyTracks/default.properties @@ -10,6 +10,10 @@ # Indicates whether an apk should be generated for each density. split.density=false # Project target. -target=Google Inc.:Google APIs:9 -proguard.config=proguard.cfg +target=Google Inc.:Google APIs:11 android.library.reference.1=../MyTracksLib/ + +# ProGuard is turned off while we investigate the removal of code that +# isn't actually dead from Fusion Tables. See issue 303 for an example of +# the result of that removal. +#proguard.config=proguard.cfg diff --git a/MyTracks/libs/README.txt b/MyTracks/libs/README.txt new file mode 100644 index 000000000..6e03a45b1 --- /dev/null +++ b/MyTracks/libs/README.txt @@ -0,0 +1,17 @@ +The libraries contained here in binary format are licensed according to their +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. + +References are provided to the libraries: + +accounts.jar (Android accounts library): +http://code.google.com/p/libs-for-android/wiki/AccountsLibrary + +google-api-client-*.jar (GData client): +http://code.google.com/p/google-api-java-client/ + +google-common.jar, +googleloginclient-helper.jar, +libmymaps.jar (Google My Maps upload library): +Licensed exclusively for use in My Tracks and derived Android applications. diff --git a/MyTracks/libs/libmymaps.jar b/MyTracks/libs/libmymaps.jar new file mode 100644 index 000000000..72659cdc6 Binary files /dev/null and b/MyTracks/libs/libmymaps.jar differ diff --git a/MyTracks/proguard.cfg b/MyTracks/proguard.cfg index 7a2867d7e..8a6087a72 100644 --- a/MyTracks/proguard.cfg +++ b/MyTracks/proguard.cfg @@ -12,14 +12,23 @@ -dontwarn com.google.android.googleapps.** -dontwarn com.android.common.** -dontwarn com.google.android.gsf.** +-dontwarn org.codehaus.** +-dontwarn com.google.appengine.** + +# 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 everything android references from XMLs -keep public class * extends android.app.Activity -keep public class * extends android.app.Application -keep public class * extends android.app.Service --keep public class * extends android.app,backup.BackupAgent +-keep public class * extends android.app.backup.BackupAgent -keep public class * extends android.content.BroadcastReceiver -keep public class * extends android.content.ContentProvider +-keep public class * extends android.preference.Preference -keep public class com.android.vending.licensing.ILicensingService -keepclasseswithmembernames class * { diff --git a/MyTracks/res/drawable-mdpi/ic_menu_chartsettings.png b/MyTracks/res/drawable/ic_menu_chartsettings.png similarity index 100% rename from MyTracks/res/drawable-mdpi/ic_menu_chartsettings.png rename to MyTracks/res/drawable/ic_menu_chartsettings.png diff --git a/MyTracks/res/drawable-mdpi/ic_menu_lastsegment.png b/MyTracks/res/drawable/ic_menu_lastsegment.png similarity index 100% rename from MyTracks/res/drawable-mdpi/ic_menu_lastsegment.png rename to MyTracks/res/drawable/ic_menu_lastsegment.png diff --git a/MyTracks/res/drawable-mdpi/ic_menu_pauserecording.png b/MyTracks/res/drawable/ic_menu_pauserecording.png similarity index 100% rename from MyTracks/res/drawable-mdpi/ic_menu_pauserecording.png rename to MyTracks/res/drawable/ic_menu_pauserecording.png diff --git a/MyTracks/res/drawable-mdpi/ic_menu_recordtrack.png b/MyTracks/res/drawable/ic_menu_recordtrack.png similarity index 100% rename from MyTracks/res/drawable-mdpi/ic_menu_recordtrack.png rename to MyTracks/res/drawable/ic_menu_recordtrack.png diff --git a/MyTracks/res/drawable-mdpi/ic_menu_sensorstatus.png b/MyTracks/res/drawable/ic_menu_sensorstatus.png similarity index 100% rename from MyTracks/res/drawable-mdpi/ic_menu_sensorstatus.png rename to MyTracks/res/drawable/ic_menu_sensorstatus.png diff --git a/MyTracks/res/drawable-mdpi/ic_menu_statistics.png b/MyTracks/res/drawable/ic_menu_statistics.png similarity index 100% rename from MyTracks/res/drawable-mdpi/ic_menu_statistics.png rename to MyTracks/res/drawable/ic_menu_statistics.png diff --git a/MyTracks/res/drawable-mdpi/ic_menu_stoprecording.png b/MyTracks/res/drawable/ic_menu_stoprecording.png similarity index 100% rename from MyTracks/res/drawable-mdpi/ic_menu_stoprecording.png rename to MyTracks/res/drawable/ic_menu_stoprecording.png diff --git a/MyTracks/res/drawable-mdpi/ic_menu_tracklist.png b/MyTracks/res/drawable/ic_menu_tracklist.png similarity index 100% rename from MyTracks/res/drawable-mdpi/ic_menu_tracklist.png rename to MyTracks/res/drawable/ic_menu_tracklist.png diff --git a/MyTracks/res/drawable-mdpi/ic_menu_waypoints.png b/MyTracks/res/drawable/ic_menu_waypoints.png similarity index 100% rename from MyTracks/res/drawable-mdpi/ic_menu_waypoints.png rename to MyTracks/res/drawable/ic_menu_waypoints.png diff --git a/MyTracks/res/layout/list.xml b/MyTracks/res/layout/list.xml new file mode 100644 index 000000000..33567b8d2 --- /dev/null +++ b/MyTracks/res/layout/list.xml @@ -0,0 +1,103 @@ + + + + + + + + + + + + + + + + + + + diff --git a/MyTracks/res/layout/mytracks_list.xml b/MyTracks/res/layout/mytracks_list.xml index ec1e189cb..720984dd8 100644 --- a/MyTracks/res/layout/mytracks_list.xml +++ b/MyTracks/res/layout/mytracks_list.xml @@ -50,6 +50,12 @@ limitations under the License. android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_weight="1"/> +