From be219bbee6185a68b9989db6f4504b617e8639c7 Mon Sep 17 00:00:00 2001 From: Sandor Dornbush Date: Tue, 21 Jun 2011 21:19:01 -0700 Subject: [PATCH] Merged with 1.1.7 --- MyTracks/.classpath | 1 + MyTracks/AndroidManifest.xml | 5 +++-- MyTracks/libs/libGoogleAnalytics.jar | Bin 0 -> 37154 bytes MyTracks/res/values/arrays.xml | 5 +++++ .../res/values/arrays_do_not_translate.xml | 10 --------- MyTracks/res/values/do_not_translate.xml | 3 +++ MyTracks/res/xml/preferences.xml | 2 +- .../android/apps/mytracks/MyTracks.java | 19 ++++++++++++++++++ .../apps/mytracks/io/file/TcxTrackWriter.java | 2 +- .../content/MyTracksProviderUtilsImpl.java | 4 ++-- 10 files changed, 35 insertions(+), 16 deletions(-) create mode 100644 MyTracks/libs/libGoogleAnalytics.jar diff --git a/MyTracks/.classpath b/MyTracks/.classpath index 636d59be6..559438787 100644 --- a/MyTracks/.classpath +++ b/MyTracks/.classpath @@ -5,6 +5,7 @@ + diff --git a/MyTracks/AndroidManifest.xml b/MyTracks/AndroidManifest.xml index 5c17c6cf5..cb8717375 100755 --- a/MyTracks/AndroidManifest.xml +++ b/MyTracks/AndroidManifest.xml @@ -17,8 +17,8 @@ limitations under the License. + android:versionCode="30" + android:versionName="1.1.7"> @@ -125,6 +125,7 @@ limitations under the License. + diff --git a/MyTracks/libs/libGoogleAnalytics.jar b/MyTracks/libs/libGoogleAnalytics.jar new file mode 100644 index 0000000000000000000000000000000000000000..a5a4e16bff9224af9f59b1a45ed22622fb866e93 GIT binary patch literal 37154 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 B0HXi^ literal 0 HcmV?d00001 diff --git a/MyTracks/res/values/arrays.xml b/MyTracks/res/values/arrays.xml index 783668362..dd6c37220 100644 --- a/MyTracks/res/values/arrays.xml +++ b/MyTracks/res/values/arrays.xml @@ -170,6 +170,11 @@ limitations under the License. inline skating skate boarding + roller skiing (classic) + roller skiing (skate) + cross-country skiing (classic) + cross-country skiing (skate) + snow shoeing skiing snow boarding diff --git a/MyTracks/res/values/arrays_do_not_translate.xml b/MyTracks/res/values/arrays_do_not_translate.xml index 219049f4f..780ee8b9e 100644 --- a/MyTracks/res/values/arrays_do_not_translate.xml +++ b/MyTracks/res/values/arrays_do_not_translate.xml @@ -38,16 +38,6 @@ limitations under the License. 100 - - 1 - 2 - 3 - 4 - 5 - 10 - 100 - - 50 100 diff --git a/MyTracks/res/values/do_not_translate.xml b/MyTracks/res/values/do_not_translate.xml index 3d752908a..9b586e743 100644 --- a/MyTracks/res/values/do_not_translate.xml +++ b/MyTracks/res/values/do_not_translate.xml @@ -39,4 +39,7 @@ limitations under the License. google.com/fusiontables maps.google.com docs.google.com + + + UA-7222692-2 diff --git a/MyTracks/res/xml/preferences.xml b/MyTracks/res/xml/preferences.xml index d964f124b..4ca9dbe59 100644 --- a/MyTracks/res/xml/preferences.xml +++ b/MyTracks/res/xml/preferences.xml @@ -42,7 +42,7 @@ limitations under the License. android:summary="@string/settings_announcement_frequency_summary" android:entries="@array/task_frequency_options" android:entryValues="@array/task_frequency_values" - android:defaultValue="-1" /> + android:defaultValue="0" /> "); - pw.print(Math.min(255, sensorData.getCadence().getValue())); + pw.print(Math.min(254, sensorData.getCadence().getValue())); pw.println(""); } } diff --git a/MyTracksLib/src/com/google/android/apps/mytracks/content/MyTracksProviderUtilsImpl.java b/MyTracksLib/src/com/google/android/apps/mytracks/content/MyTracksProviderUtilsImpl.java index 971bdd60f..44ff1891a 100644 --- a/MyTracksLib/src/com/google/android/apps/mytracks/content/MyTracksProviderUtilsImpl.java +++ b/MyTracksLib/src/com/google/android/apps/mytracks/content/MyTracksProviderUtilsImpl.java @@ -846,7 +846,7 @@ public class MyTracksProviderUtilsImpl implements MyTracksProviderUtils { @Override public Cursor getLocationsCursor(long trackId, long minTrackPointId, int maxLocations, boolean descending) { - if (trackId < 0 || maxLocations < 1) { + if (trackId < 0) { return null; } @@ -870,7 +870,7 @@ public class MyTracksProviderUtilsImpl implements MyTracksProviderUtils { @Override public Cursor getWaypointsCursor(long trackId, long minWaypointId, int maxWaypoints) { - if (trackId < 0 || maxWaypoints < 1) { + if (trackId < 0) { return null; }