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 5ae3b5687..000000000 Binary files a/MyTracks/res/drawable-ldpi/ic_menu_lastsegment.png and /dev/null differ diff --git a/MyTracks/res/layout/about.xml b/MyTracks/res/layout/about.xml index 0870154b7..74ef6aa7a 100644 --- a/MyTracks/res/layout/about.xml +++ b/MyTracks/res/layout/about.xml @@ -31,12 +31,12 @@ limitations under the License. @@ -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"/> - -