From c3cda976928c7356137f486fea2c541eb9cb3e2a Mon Sep 17 00:00:00 2001 From: Rodrigo Damazio Date: Mon, 14 Nov 2011 23:27:04 -0200 Subject: [PATCH] Merged to head --- .hgignore | 2 +- MyTracks/.classpath | 8 +- MyTracks/.project | 75 +- MyTracks/.settings/org.eclipse.jdt.core.prefs | 12 +- MyTracks/AndroidManifest.xml | 63 +- MyTracks/proguard.cfg | 6 + ...{default.properties => project.properties} | 14 +- .../res/drawable-ldpi/ic_menu_lastsegment.png | Bin 1268 -> 0 bytes MyTracks/res/layout/about.xml | 17 +- MyTracks/res/layout/chart_settings.xml | 49 +- MyTracks/res/layout/list.xml | 8 +- MyTracks/res/layout/mytracks_detail.xml | 47 +- MyTracks/res/layout/mytracks_layout.xml | 2 +- MyTracks/res/layout/mytracks_list.xml | 42 +- .../res/layout/mytracks_send_to_google.xml | 53 +- .../res/layout/mytracks_waypoint_details.xml | 101 +- .../res/layout/mytracks_waypoints_list.xml | 34 +- MyTracks/res/layout/send_to_google_result.xml | 6 +- MyTracks/res/layout/sensor_state.xml | 16 +- MyTracks/res/layout/stats.xml | 30 +- MyTracks/res/layout/track_widget.xml | 6 +- MyTracks/res/layout/welcome.xml | 32 +- MyTracks/res/menu/main.xml | 37 +- MyTracks/res/values-ca/arrays.xml | 287 -- MyTracks/res/values-ca/strings.xml | 594 ++-- MyTracks/res/values-de/arrays.xml | 285 -- MyTracks/res/values-de/strings.xml | 638 ++-- MyTracks/res/values-es-rES/arrays.xml | 146 - MyTracks/res/values-es-rES/strings.xml | 132 +- MyTracks/res/values-es/arrays.xml | 266 -- MyTracks/res/values-es/strings.xml | 632 ++-- MyTracks/res/values-fi/arrays.xml | 271 -- MyTracks/res/values-fi/strings.xml | 743 ++--- MyTracks/res/values-fr/arrays.xml | 294 -- MyTracks/res/values-fr/strings.xml | 595 ++-- MyTracks/res/values-it/arrays.xml | 266 -- MyTracks/res/values-it/strings.xml | 506 ++-- MyTracks/res/values-ja/arrays.xml | 275 -- MyTracks/res/values-ja/strings.xml | 687 ++--- MyTracks/res/values-pl/arrays.xml | 275 -- MyTracks/res/values-pl/strings.xml | 596 ++-- MyTracks/res/values-pt-rBR/arrays.xml | 267 -- MyTracks/res/values-pt-rBR/strings.xml | 473 +-- MyTracks/res/values-ru/arrays.xml | 275 -- MyTracks/res/values-ru/strings.xml | 734 ++--- MyTracks/res/values-sv/arrays.xml | 265 -- MyTracks/res/values-sv/strings.xml | 512 ++-- MyTracks/res/values-zh-rCN/arrays.xml | 280 -- MyTracks/res/values-zh-rCN/strings.xml | 690 ++--- MyTracks/res/values/arrays.xml | 280 -- .../res/values/arrays_do_not_translate.xml | 253 +- MyTracks/res/values/do_not_translate.xml | 68 +- MyTracks/res/values/keys.xml | 39 +- MyTracks/res/values/strings.xml | 2553 +++++++++++++---- MyTracks/res/values/styles.xml | 21 +- MyTracks/res/values/urls.xml | 21 - MyTracks/res/xml/preferences.xml | 165 +- .../android/apps/mytracks/AccountChooser.java | 12 +- .../mytracks/AggregatedStatsActivity.java | 2 +- .../android/apps/mytracks/AntPreference.java | 7 +- .../mytracks/AutoCompleteTextPreference.java | 64 + .../android/apps/mytracks/ChartActivity.java | 3 +- .../apps/mytracks/ChartValueSeries.java | 7 +- .../android/apps/mytracks/ChartView.java | 21 +- .../android/apps/mytracks/CheckUnits.java | 74 +- .../android/apps/mytracks/Constants.java | 1 - .../apps/mytracks/DeleteAllTracks.java | 10 +- .../android/apps/mytracks/DeleteTrack.java | 10 +- .../android/apps/mytracks/DialogManager.java | 8 +- .../google/android/apps/mytracks/Eula.java | 8 +- .../apps/mytracks/ExportAllTracks.java | 20 +- .../apps/mytracks/ImportAllTracks.java | 86 +- .../android/apps/mytracks/MapActivity.java | 70 +- .../android/apps/mytracks/MapOverlay.java | 20 +- .../android/apps/mytracks/MenuManager.java | 13 +- .../apps/mytracks/MyMapsListAdapter.java | 4 +- .../android/apps/mytracks/MyTracks.java | 17 +- .../apps/mytracks/ProgressIndicator.java | 2 +- .../apps/mytracks/SensorStateActivity.java | 147 +- .../apps/mytracks/SettingsActivity.java | 370 ++- .../android/apps/mytracks/StatsActivity.java | 41 +- .../android/apps/mytracks/StatsUtilities.java | 32 +- .../android/apps/mytracks/TrackDetails.java | 2 +- .../android/apps/mytracks/TrackList.java | 60 +- .../apps/mytracks/WaypointDetails.java | 2 +- .../android/apps/mytracks/WaypointsList.java | 22 +- .../apps/mytracks/WelcomeActivity.java | 6 +- .../content/DataSourcesWrapperImpl.java | 4 +- .../mytracks/content/MyTracksProvider.java | 36 + .../apps/mytracks/content/TrackDataHub.java | 13 +- .../mytracks/content/TrackDataListeners.java | 4 +- .../apps/mytracks/io/ModernAuthManager.java | 12 +- .../android/apps/mytracks/io/SendToDocs.java | 19 +- .../apps/mytracks/io/SendToFusionTables.java | 36 +- .../apps/mytracks/io/SendToMyMaps.java | 39 +- .../io/backup/BackupActivityHelper.java | 37 +- .../io/backup/BackupPreferencesListener.java | 52 +- .../backup/BackupPreferencesListenerImpl.java | 40 + .../apps/mytracks/io/docs/DocsHelper.java | 28 +- .../apps/mytracks/io/docs/DocsTagBuilder.java | 4 +- .../apps/mytracks/io/file/ImportActivity.java | 184 +- .../apps/mytracks/io/file/SaveActivity.java | 19 +- .../mytracks/io/file/TempFileCleaner.java | 10 +- .../mytracks/io/file/TrackWriterImpl.java | 12 +- .../io/file/WriteProgressController.java | 4 +- .../mytracks/io/gdata/AndroidGDataClient.java | 24 +- .../apps/mytracks/io/gdata/GDataWrapper.java | 2 +- .../apps/mytracks/io/mymaps/MapsFacade.java | 25 +- .../io/mymaps/XmlMapsGDataParserFactory.java | 6 +- .../io/mymaps/XmlMapsGDataSerializer.java | 6 +- .../io/sendtogoogle/ResultDialogFactory.java | 8 +- .../io/sendtogoogle/SendActivity.java | 51 +- .../mytracks/io/sendtogoogle/SendDialog.java | 19 - .../mytracks/io/sendtogoogle/SendType.java | 12 +- .../maps/SingleColorTrackPathPainter.java | 7 +- .../maps/TrackPathPainterFactory.java | 7 +- .../services/ControlRecordingService.java | 121 + .../services/DefaultTrackNameFactory.java | 2 +- .../services/TrackRecordingService.java | 170 +- .../sensors/BluetoothConnectionManager.java | 42 +- .../sensors/BluetoothSensorManager.java | 57 +- .../services/sensors/PolarMessageParser.java | 8 +- .../sensors/SensorManagerFactory.java | 8 +- .../services/sensors/SensorUtils.java | 20 +- .../services/sensors/ZephyrMessageParser.java | 7 +- .../sensors/ant/AntSensorManager.java | 92 +- .../tasks/StatusAnnouncerFactory.java | 6 +- .../services/tasks/StatusAnnouncerTask.java | 71 +- .../apps/mytracks/util/ApiFeatures.java | 69 +- ...formAdapter.java => ApiLevel3Adapter.java} | 50 +- ...formAdapter.java => ApiLevel5Adapter.java} | 18 +- .../apps/mytracks/util/ApiLevel8Adapter.java | 26 + ...formAdapter.java => ApiLevel9Adapter.java} | 27 +- ...tformAdapter.java => ApiLevelAdapter.java} | 67 +- .../apps/mytracks/util/ChartURLGenerator.java | 2 +- .../apps/mytracks/util/StringUtils.java | 154 +- .../mytracks/widgets/TrackWidgetProvider.java | 67 +- .../gdata/docs/SpreadsheetsClient.java | 6 +- .../gdata/docs/XmlDocsGDataParserFactory.java | 2 +- MyTracksApiSample/.classpath | 9 + MyTracksApiSample/.project | 33 + .../.settings/org.eclipse.jdt.core.prefs | 316 ++ .../.settings/org.eclipse.jdt.ui.prefs | 4 + MyTracksApiSample/AndroidManifest.xml | 31 + MyTracksApiSample/proguard.cfg | 40 + MyTracksApiSample/project.properties | 12 + MyTracksApiSample/res/drawable-hdpi/icon.png | Bin 0 -> 4147 bytes MyTracksApiSample/res/drawable-ldpi/icon.png | Bin 0 -> 1723 bytes MyTracksApiSample/res/drawable-mdpi/icon.png | Bin 0 -> 2574 bytes MyTracksApiSample/res/layout/main.xml | 26 + MyTracksApiSample/res/values/strings.xml | 7 + .../mytracks/samples/api/MainActivity.java | 162 ++ .../samples/api/MyTracksReceiver.java | 36 + MyTracksLib/.classpath | 4 +- .../.settings/org.eclipse.jdt.core.prefs | 12 +- ...{default.properties => project.properties} | 6 +- MyTracksLib/res/values/third_party.xml | 12 +- .../android/apps/mytracks/content/Track.java | 8 +- .../apps/mytracks/stats/TripStatistics.java | 2 +- MyTracksTest/.classpath | 5 +- MyTracksTest/.factorypath | 7 +- .../.settings/org.eclipse.jdt.apt.core.prefs | 6 +- .../.settings/org.eclipse.jdt.core.prefs | 12 +- ...{default.properties => project.properties} | 8 +- .../apps/mytracks/ChartValueSeriesTest.java | 4 +- .../android/apps/mytracks/MapOverlayTest.java | 36 +- .../apps/mytracks/MockMyTracksOverlay.java | 8 +- .../android/apps/mytracks/MyTracksTest.java | 2 +- .../io/docs/DocsHelper_AddTrackRowTest.java | 36 +- .../mytracks/io/file/TrackWriterTest.java | 2 +- .../sendtogoogle/ResultDialogFactoryTest.java | 36 +- .../TrackPathDescriptorDynamicSpeedTest.java | 13 +- .../TrackPathDescriptorFixedSpeedTest.java | 10 +- .../maps/TrackPathPainterFactoryTest.java | 15 +- .../maps/TrackPathPainterSingleColorTest.java | 7 +- .../services/TrackRecordingServiceTest.java | 32 +- .../sensors/SensorManagerFactoryTest.java | 6 +- .../sensors/ant/AntSensorManagerTest.java | 20 +- .../tasks/StatusAnnouncerTaskTest.java | 110 +- .../apps/mytracks/util/ApiFeaturesTest.java | 13 +- SignalStrengthSampler/.classpath | 7 +- SignalStrengthSampler/.project | 7 - .../.settings/org.eclipse.jdt.core.prefs | 282 +- .../.settings/org.eclipse.jdt.ui.prefs | 4 + SignalStrengthSampler/AndroidManifest.xml | 2 - ...{default.properties => project.properties} | 8 +- .../RecordingStateReceiver.java | 6 +- SignalStrengthSamplerTest/.classpath | 8 +- .../.settings/org.eclipse.jdt.core.prefs | 282 +- .../.settings/org.eclipse.jdt.ui.prefs | 4 + .../libs/AndroidMockGenerator.jar | Bin 0 -> 695878 bytes ...{default.properties => project.properties} | 4 +- .../test/RecordingStateReceiverTest.java | 12 - 193 files changed, 8457 insertions(+), 11274 deletions(-) rename MyTracks/{default.properties => project.properties} (68%) delete mode 100644 MyTracks/res/drawable-ldpi/ic_menu_lastsegment.png delete mode 100644 MyTracks/res/values-ca/arrays.xml delete mode 100644 MyTracks/res/values-de/arrays.xml delete mode 100644 MyTracks/res/values-es-rES/arrays.xml delete mode 100644 MyTracks/res/values-es/arrays.xml delete mode 100644 MyTracks/res/values-fi/arrays.xml delete mode 100644 MyTracks/res/values-fr/arrays.xml delete mode 100644 MyTracks/res/values-it/arrays.xml delete mode 100644 MyTracks/res/values-ja/arrays.xml delete mode 100644 MyTracks/res/values-pl/arrays.xml delete mode 100644 MyTracks/res/values-pt-rBR/arrays.xml delete mode 100755 MyTracks/res/values-ru/arrays.xml delete mode 100644 MyTracks/res/values-sv/arrays.xml delete mode 100644 MyTracks/res/values-zh-rCN/arrays.xml delete mode 100644 MyTracks/res/values/arrays.xml delete mode 100644 MyTracks/res/values/urls.xml create mode 100644 MyTracks/src/com/google/android/apps/mytracks/AutoCompleteTextPreference.java create mode 100644 MyTracks/src/com/google/android/apps/mytracks/io/backup/BackupPreferencesListenerImpl.java create mode 100644 MyTracks/src/com/google/android/apps/mytracks/services/ControlRecordingService.java rename MyTracks/src/com/google/android/apps/mytracks/util/{CupcakePlatformAdapter.java => ApiLevel3Adapter.java} (62%) rename MyTracks/src/com/google/android/apps/mytracks/util/{EclairPlatformAdapter.java => ApiLevel5Adapter.java} (75%) create mode 100644 MyTracks/src/com/google/android/apps/mytracks/util/ApiLevel8Adapter.java rename MyTracks/src/com/google/android/apps/mytracks/util/{GingerbreadPlatformAdapter.java => ApiLevel9Adapter.java} (51%) rename MyTracks/src/com/google/android/apps/mytracks/util/{ApiPlatformAdapter.java => ApiLevelAdapter.java} (52%) create mode 100644 MyTracksApiSample/.classpath create mode 100644 MyTracksApiSample/.project create mode 100644 MyTracksApiSample/.settings/org.eclipse.jdt.core.prefs create mode 100644 MyTracksApiSample/.settings/org.eclipse.jdt.ui.prefs create mode 100644 MyTracksApiSample/AndroidManifest.xml create mode 100644 MyTracksApiSample/proguard.cfg create mode 100644 MyTracksApiSample/project.properties create mode 100644 MyTracksApiSample/res/drawable-hdpi/icon.png create mode 100644 MyTracksApiSample/res/drawable-ldpi/icon.png create mode 100644 MyTracksApiSample/res/drawable-mdpi/icon.png create mode 100644 MyTracksApiSample/res/layout/main.xml create mode 100644 MyTracksApiSample/res/values/strings.xml create mode 100644 MyTracksApiSample/src/com/google/android/apps/mytracks/samples/api/MainActivity.java create mode 100644 MyTracksApiSample/src/com/google/android/apps/mytracks/samples/api/MyTracksReceiver.java rename MyTracksLib/{default.properties => project.properties} (77%) rename MyTracksTest/{default.properties => project.properties} (76%) create mode 100644 SignalStrengthSampler/.settings/org.eclipse.jdt.ui.prefs rename SignalStrengthSampler/{default.properties => project.properties} (69%) create mode 100644 SignalStrengthSamplerTest/.settings/org.eclipse.jdt.ui.prefs create mode 100644 SignalStrengthSamplerTest/libs/AndroidMockGenerator.jar rename SignalStrengthSamplerTest/{default.properties => project.properties} (75%) diff --git a/.hgignore b/.hgignore index ffa8823b5..8bd036659 100644 --- a/.hgignore +++ b/.hgignore @@ -4,7 +4,7 @@ syntax:glob */gen/** */proguard/** .metadata -MyTracksTest/annotations.log +MyTracksTest/AnnotationProcessor.log **/*.pyc **/*.pyo syntax: glob diff --git a/MyTracks/.classpath b/MyTracks/.classpath index 4a148f304..0e176d3ac 100644 --- a/MyTracks/.classpath +++ b/MyTracks/.classpath @@ -2,10 +2,10 @@ - + - + @@ -16,6 +16,6 @@ - - + + diff --git a/MyTracks/.project b/MyTracks/.project index 4ff12bb43..cf54ef5ba 100644 --- a/MyTracks/.project +++ b/MyTracks/.project @@ -1,41 +1,34 @@ - - - MyTracks - - - MyTracksLib - - - - com.android.ide.eclipse.adt.ResourceManagerBuilder - - - - - com.android.ide.eclipse.adt.PreCompilerBuilder - - - - - org.eclipse.jdt.core.javabuilder - - - - - com.android.ide.eclipse.adt.ApkBuilder - - - - - - com.android.ide.eclipse.adt.AndroidNature - org.eclipse.jdt.core.javanature - - - - MyTracksLib_src - 2 - _android_MyTracksLib_e2802071/src - - - + + + MyTracks + + + MyTracksLib + + + + com.android.ide.eclipse.adt.ResourceManagerBuilder + + + + + com.android.ide.eclipse.adt.PreCompilerBuilder + + + + + org.eclipse.jdt.core.javabuilder + + + + + com.android.ide.eclipse.adt.ApkBuilder + + + + + + com.android.ide.eclipse.adt.AndroidNature + org.eclipse.jdt.core.javanature + + diff --git a/MyTracks/.settings/org.eclipse.jdt.core.prefs b/MyTracks/.settings/org.eclipse.jdt.core.prefs index 5ff51baab..60e490024 100644 --- a/MyTracks/.settings/org.eclipse.jdt.core.prefs +++ b/MyTracks/.settings/org.eclipse.jdt.core.prefs @@ -1,4 +1,4 @@ -#Thu Jul 21 03:01:59 BRT 2011 +#Fri Oct 21 20:06:28 BRST 2011 eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6 @@ -92,12 +92,14 @@ org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0 org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16 org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16 org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16 +org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80 org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16 org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16 org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=48 org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16 org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16 org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16 +org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch=16 org.eclipse.jdt.core.formatter.blank_lines_after_imports=1 org.eclipse.jdt.core.formatter.blank_lines_after_package=1 org.eclipse.jdt.core.formatter.blank_lines_before_field=0 @@ -227,12 +229,14 @@ org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invoca org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_try=do not insert org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert +org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources=insert org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert @@ -256,6 +260,7 @@ org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invoc org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_try=do not insert org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert @@ -311,6 +316,7 @@ org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invoc org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_try=insert org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert @@ -320,6 +326,7 @@ org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=inser org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources=do not insert org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert @@ -335,7 +342,7 @@ org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=true org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false -org.eclipse.jdt.core.formatter.lineSplit=80 +org.eclipse.jdt.core.formatter.lineSplit=100 org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0 @@ -346,4 +353,5 @@ org.eclipse.jdt.core.formatter.tabulation.size=2 org.eclipse.jdt.core.formatter.use_on_off_tags=false org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true +org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true diff --git a/MyTracks/AndroidManifest.xml b/MyTracks/AndroidManifest.xml index f4dc05e85..6245fab09 100755 --- a/MyTracks/AndroidManifest.xml +++ b/MyTracks/AndroidManifest.xml @@ -17,10 +17,10 @@ limitations under the License. + android:versionCode="33" + android:versionName="1.1.10"> @@ -35,7 +35,6 @@ limitations under the License. android:writePermission="com.google.android.apps.mytracks.WRITE_TRACK_DATA" /> @@ -50,7 +49,6 @@ limitations under the License. @@ -58,20 +56,18 @@ limitations under the License. - + - + + android:label="@string/track_detail_title"> @@ -81,7 +77,6 @@ limitations under the License. @@ -92,7 +87,7 @@ limitations under the License. + android:label="@string/marker_detail_title"> @@ -103,17 +98,16 @@ limitations under the License. + android:label="@string/settings_title" > + android:label="@string/menu_aggregated_statistics" /> @@ -121,10 +115,9 @@ limitations under the License. + android:label="@string/menu_sensor_state" /> @@ -132,7 +125,6 @@ limitations under the License. @@ -141,7 +133,6 @@ limitations under the License. @@ -151,7 +142,6 @@ limitations under the License. @@ -168,16 +158,19 @@ limitations under the License. + + @@ -189,7 +182,6 @@ limitations under the License. - @@ -229,26 +221,33 @@ limitations under the License. + android:label="@string/permission_notification_label" + android:description="@string/permission_notification_description" + android:protectionLevel="dangerous" /> + + + - + diff --git a/MyTracks/proguard.cfg b/MyTracks/proguard.cfg index 17ce7b54e..8a6a82b85 100644 --- a/MyTracks/proguard.cfg +++ b/MyTracks/proguard.cfg @@ -67,3 +67,9 @@ # Needed by Guava -dontwarn sun.misc.Unsafe + +# 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/default.properties b/MyTracks/project.properties similarity index 68% rename from MyTracks/default.properties rename to MyTracks/project.properties index 75e62f9cb..f4def9fb2 100644 --- a/MyTracks/default.properties +++ b/MyTracks/project.properties @@ -1,17 +1,15 @@ # This file is automatically generated by Android Tools. # Do not modify this file -- YOUR CHANGES WILL BE ERASED! -# +# # This file must be checked in Version Control Systems. -# +# # To customize properties used by the Ant build system use, -# "build.properties", and override values to adapt the script to your +# "ant.properties", and override values to adapt the script to your # project structure. # Indicates whether an apk should be generated for each density. split.density=false -# Project target. -target=Google Inc.:Google APIs:13 -android.library.reference.1=../MyTracksLib/ - -# Enable proguard. proguard.config=proguard.cfg +# Project target. +target=Google Inc.:Google APIs:14 +android.library.reference.1=../MyTracksLib diff --git a/MyTracks/res/drawable-ldpi/ic_menu_lastsegment.png b/MyTracks/res/drawable-ldpi/ic_menu_lastsegment.png deleted file mode 100644 index 5ae3b5687dd18511975cede5bdcee2b5a5d7b962..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1268 zcmV zT1WhWjD{fCE(Qlh5JiIwZn9Eb%w*AV{NngQqbmc3hzWy3vI*G)A)xduk_-Vs7a@#J zf;d??ppA(Czy0r;dn#3?QdTFB>27A>gGW`r``)Yb&OP_O+Z@mH>}_fq_Lj99KsSKi zwCUb-gR!wO)$yUBA&wq;@z4S4L7K~}%!@1_6%YpMX6mNt>FGOLTU+lJ6cl{h+S>Y3 z1QuO}6iquZF>!ZubMsTT+kKnkI3orV6BGC7u^tmZip0tn78d$_K3_S;&1N$@K0d}A zJK3Jl(;anDheDyNj-O3UO{-~XX-AovnJgh8fmtjTMgTt`n{jw}n3K;J*F+W&n2`GD z=qTv&5{Q+!xHzWQ>)|d&?z1f}F5V(r(#Xh2JawJ4CaNwA27`F`3CwR77Z-QI06+x- z0X9EB|8RD8R_FKoy(IQ_S{I0lh9ug@$Hx(25OD&5dF67sSVl&MU`t6!VS9UfEzneH zY3V0_Eel0m)SAi3$*Q%rwZ|Hb#zs220&BHeS#okRUQes5tDRsmT$K?qhVa_i*||73 zH~00)$;lA8Pw(}51v`a5Gnq`xXf!&rv$OXH2M2@U7>Zbw_4W1P$QO-`jb9WM6@5f* z+C_w+0TA?+m6i1!{dAL#q8DY-#&AJ@e?Pu(R$gB2BvAF_rsqjXNkTp%P-|6HRlmYr zQ4M=(V=#b|i%hxcy7;}KqT)l+()Z9%YHI2%jbHZk^zbnOBnQ>q-OUdS4EV@x+qJc| z4-5u_BPS>48=CIHoR|TUgSx!DWWBw;$Ti1xb#;%+%F0|_U0uQd0>sI~RxB5^F(`XN zQb~f$5iaaa9UUDXQ)abr2#W|c`Bu{5K~r&Y@lWmT?JuA=5#TjIghfA0Y2LEGzb{aa z+<`2s)&5Nyu7QJt1BM)fYk|bdNF)CMad>#h&d<*UFt8)aByeyO_IEm+{oC8ytyDw( z0BxxO@=#bdQ>a=g+uozHp(Q^*{}DyWOWKH+ol;Bnj-3jxF1i}N%FE09MN#K)q@T2v zm6aI+@{F|e1Q)K1G4AZ_?A?Whh0k_(ckk2C({O;i_4W1G+_Jp9e1{fc?2pRI%4doX z8rRp?(_ts@F1y|Sqe%PJH&<6z3r|l^@qR@1pK)c#?bP2{T3T`t;6&wZA^*XP9}ZBt zz{4eUNkVjf1t1NLhhQfr;CsKr;qXhwsi`S26oB315e^=Z+r>FP*wv(}dY3^b=wdk$ z){gKNeC_dEO9j##rCkhl4r}GwR09NM;_|UlslcIpApe8XOa(&*Vjyl~V}r%V$0JQ- z%*@PqFd3not<=>&2}J*On*7iBB6jcq?)YSY*QDw%4RMQ9> zN*AXb5U56nOVO2puoj>(4%esvJ|a+0o12@zlt-A7A-(v2N*{wv9Tb6h|IKAL|Lt!8 e{h#()fB^uPOu<8d`n8Jy0000 @@ -67,6 +67,11 @@ limitations under the License. android:layout_width="wrap_content" android:text="@string/about_dylan" android:textSize="20sp" /> + @@ -119,7 +124,7 @@ limitations under the License. android:autoLink="web" android:layout_height="wrap_content" android:layout_width="wrap_content" - android:text="@string/about_weburl" + android:text="@string/my_tracks_web_url" android:textSize="18sp" /> @@ -138,7 +143,7 @@ limitations under the License. android:autoLink="web" android:layout_height="wrap_content" android:layout_width="wrap_content" - android:text="@string/about_privacy_weburl" + android:text="@string/my_tracks_privacy_url" android:textSize="18sp" /> diff --git a/MyTracks/res/layout/chart_settings.xml b/MyTracks/res/layout/chart_settings.xml index 6178579bc..acfec28d7 100644 --- a/MyTracks/res/layout/chart_settings.xml +++ b/MyTracks/res/layout/chart_settings.xml @@ -26,7 +26,7 @@ limitations under the License. @@ -57,7 +57,7 @@ limitations under the License. + android:text="@string/chart_settings_by_distance"/> + android:text="@string/chart_settings_by_time"/> @@ -90,59 +90,48 @@ limitations under the License. + android:text="@string/stat_elevation"/> + android:text="@string/stat_speed"/> + android:text="@string/sensor_state_power"/> + android:text="@string/sensor_state_cadence"/> + android:text="@string/sensor_state_heart_rate"/> - -