Releasing version 1.0.17

Also greatly simplifying name sanitization.

.hgignore

@@ -2,10 +2,4 @@ syntax:glob
 
 */bin
 */gen/**
-*/proguard/**
 .metadata
-MyTracksTest/AnnotationProcessor.log
-**/*.pyc
-**/*.pyo
-syntax: glob
-MyTracksTest/hs_err_pid*.log

MyTracks/.classpath

@@ -1,21 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
-	<classpathentry kind="lib" path="libs/googleloginclient-helper.jar"/>
-	<classpathentry exported="true" kind="lib" path="libs/google-common.jar"/>
-	<classpathentry kind="lib" path="libs/libGoogleAnalytics.jar"/>
-	<classpathentry kind="lib" path="libs/google-api-client/commons-codec-1.3.jar"/>
-	<classpathentry exported="true" kind="lib" path="libs/google-api-client/commons-logging-1.1.1.jar"/>
-	<classpathentry kind="lib" path="libs/google-api-client/google-api-client-1.5.0-beta.jar"/>
-	<classpathentry kind="lib" path="libs/google-api-client/google-http-client-1.5.0-beta.jar"/>
-	<classpathentry kind="lib" path="libs/google-api-client/google-oauth-client-1.5.0-beta.jar"/>
-	<classpathentry kind="lib" path="libs/google-api-client/gson-1.6.jar"/>
-	<classpathentry kind="lib" path="libs/google-api-client/guava-r09.jar"/>
-	<classpathentry kind="lib" path="libs/google-api-client/jackson-core-asl-1.6.7.jar"/>
-	<classpathentry kind="lib" path="libs/google-api-client/jsr305-1.3.9.jar"/>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="src" path="gen"/>
-	<classpathentry exported="true" kind="lib" path="/MyTracksLib/libs/protobuf-java-2.3.0-lite.jar"/>
-	<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
-	<classpathentry kind="output" path="bin/classes"/>
-</classpath>
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
+	<classpathentry kind="lib" path="libs/googleloginclient-helper.jar"/>
+	<classpathentry kind="lib" path="libs/google-common.jar"/>
+	<classpathentry kind="lib" path="libs/accounts.jar"/>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="src" path="gen"/>
+	<classpathentry kind="output" path="bin"/>
+</classpath>

MyTracks/.project

@@ -3,7 +3,6 @@
 	<name>MyTracks</name>
 	<comment></comment>
 	<projects>
-		<project>MyTracksLib</project>
 	</projects>
 	<buildSpec>
 		<buildCommand>

MyTracks/.settings/org.eclipse.jdt.core.prefs

@@ -1,4 +1,4 @@
-#Fri Oct 21 20:06:28 BRST 2011
+#Thu Aug 12 18:54:52 BRT 2010
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
 org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
@@ -7,351 +7,6 @@ org.eclipse.jdt.core.compiler.compliance=1.6
 org.eclipse.jdt.core.compiler.debug.lineNumber=generate
 org.eclipse.jdt.core.compiler.debug.localVariable=generate
 org.eclipse.jdt.core.compiler.debug.sourceFile=generate
-org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
-org.eclipse.jdt.core.compiler.problem.comparingIdentical=warning
-org.eclipse.jdt.core.compiler.problem.deadCode=warning
-org.eclipse.jdt.core.compiler.problem.deprecation=warning
-org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
-org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
-org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
-org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.problem.fallthroughCase=warning
-org.eclipse.jdt.core.compiler.problem.fatalOptionalError=disabled
-org.eclipse.jdt.core.compiler.problem.fieldHiding=warning
-org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning
-org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
-org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
-org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
-org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore
-org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore
-org.eclipse.jdt.core.compiler.problem.localVariableHiding=warning
-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning
-org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=warning
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotationForInterfaceMethodImplementation=enabled
-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=ignore
-org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=warning
-org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
-org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
-org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore
-org.eclipse.jdt.core.compiler.problem.nullReference=warning
-org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
-org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore
-org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=ignore
-org.eclipse.jdt.core.compiler.problem.potentialNullReference=ignore
-org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning
-org.eclipse.jdt.core.compiler.problem.redundantNullCheck=warning
-org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=ignore
-org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
-org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled
-org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
-org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
-org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
-org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
-org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
-org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore
-org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=ignore
-org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=warning
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=disabled
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
-org.eclipse.jdt.core.compiler.problem.unusedImport=warning
-org.eclipse.jdt.core.compiler.problem.unusedLabel=warning
-org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
-org.eclipse.jdt.core.compiler.problem.unusedObjectAllocation=ignore
-org.eclipse.jdt.core.compiler.problem.unusedParameter=warning
-org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=disabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
-org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
-org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
 org.eclipse.jdt.core.compiler.source=1.6
-org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=48
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16
-org.eclipse.jdt.core.formatter.alignment_for_assignment=0
-org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16
-org.eclipse.jdt.core.formatter.alignment_for_compact_if=16
-org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80
-org.eclipse.jdt.core.formatter.alignment_for_enum_constants=48
-org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16
-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
-org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0
-org.eclipse.jdt.core.formatter.blank_lines_before_imports=1
-org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1
-org.eclipse.jdt.core.formatter.blank_lines_before_method=1
-org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1
-org.eclipse.jdt.core.formatter.blank_lines_before_package=0
-org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1
-org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1
-org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line
-org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=true
-org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=true
-org.eclipse.jdt.core.formatter.comment.format_block_comments=true
-org.eclipse.jdt.core.formatter.comment.format_header=false
-org.eclipse.jdt.core.formatter.comment.format_html=true
-org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true
-org.eclipse.jdt.core.formatter.comment.format_line_comments=true
-org.eclipse.jdt.core.formatter.comment.format_source_code=true
-org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true
-org.eclipse.jdt.core.formatter.comment.indent_root_tags=true
-org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert
-org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=do not insert
-org.eclipse.jdt.core.formatter.comment.line_length=80
-org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true
-org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true
-org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments=false
-org.eclipse.jdt.core.formatter.compact_else_if=true
-org.eclipse.jdt.core.formatter.continuation_indentation=2
-org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2
-org.eclipse.jdt.core.formatter.disabling_tag=@formatter\:off
-org.eclipse.jdt.core.formatter.enabling_tag=@formatter\:on
-org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=true
-org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column=true
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true
-org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true
-org.eclipse.jdt.core.formatter.indent_empty_lines=false
-org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true
-org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true
-org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true
-org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=true
-org.eclipse.jdt.core.formatter.indentation.size=4
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package=insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type=insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_label=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert
-org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert
-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
-org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert
-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
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert
-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
-org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert
-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
-org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.join_lines_in_comments=true
-org.eclipse.jdt.core.formatter.join_wrapped_lines=true
-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=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
-org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=1
-org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true
-org.eclipse.jdt.core.formatter.tabulation.char=space
-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

MyTracks/.settings/org.eclipse.jdt.ui.prefs

@@ -1,61 +0,0 @@
-#Thu Jul 21 03:04:13 BRT 2011
-eclipse.preferences.version=1
-editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true
-formatter_profile=_MyTracks
-formatter_settings_version=12
-org.eclipse.jdt.ui.ignorelowercasenames=true
-org.eclipse.jdt.ui.importorder=com;android;java;javax;org;
-org.eclipse.jdt.ui.ondemandthreshold=99
-org.eclipse.jdt.ui.staticondemandthreshold=99
-sp_cleanup.add_default_serial_version_id=true
-sp_cleanup.add_generated_serial_version_id=false
-sp_cleanup.add_missing_annotations=true
-sp_cleanup.add_missing_deprecated_annotations=true
-sp_cleanup.add_missing_methods=false
-sp_cleanup.add_missing_nls_tags=false
-sp_cleanup.add_missing_override_annotations=true
-sp_cleanup.add_missing_override_annotations_interface_methods=true
-sp_cleanup.add_serial_version_id=false
-sp_cleanup.always_use_blocks=true
-sp_cleanup.always_use_parentheses_in_expressions=false
-sp_cleanup.always_use_this_for_non_static_field_access=false
-sp_cleanup.always_use_this_for_non_static_method_access=false
-sp_cleanup.convert_to_enhanced_for_loop=false
-sp_cleanup.correct_indentation=false
-sp_cleanup.format_source_code=false
-sp_cleanup.format_source_code_changes_only=false
-sp_cleanup.make_local_variable_final=false
-sp_cleanup.make_parameters_final=false
-sp_cleanup.make_private_fields_final=true
-sp_cleanup.make_type_abstract_if_missing_method=false
-sp_cleanup.make_variable_declarations_final=true
-sp_cleanup.never_use_blocks=false
-sp_cleanup.never_use_parentheses_in_expressions=true
-sp_cleanup.on_save_use_additional_actions=false
-sp_cleanup.organize_imports=true
-sp_cleanup.qualify_static_field_accesses_with_declaring_class=false
-sp_cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true
-sp_cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true
-sp_cleanup.qualify_static_member_accesses_with_declaring_class=false
-sp_cleanup.qualify_static_method_accesses_with_declaring_class=false
-sp_cleanup.remove_private_constructors=true
-sp_cleanup.remove_trailing_whitespaces=false
-sp_cleanup.remove_trailing_whitespaces_all=true
-sp_cleanup.remove_trailing_whitespaces_ignore_empty=false
-sp_cleanup.remove_unnecessary_casts=true
-sp_cleanup.remove_unnecessary_nls_tags=false
-sp_cleanup.remove_unused_imports=false
-sp_cleanup.remove_unused_local_variables=false
-sp_cleanup.remove_unused_private_fields=true
-sp_cleanup.remove_unused_private_members=false
-sp_cleanup.remove_unused_private_methods=true
-sp_cleanup.remove_unused_private_types=true
-sp_cleanup.sort_members=false
-sp_cleanup.sort_members_all=false
-sp_cleanup.use_blocks=false
-sp_cleanup.use_blocks_only_for_return_and_throw=false
-sp_cleanup.use_parentheses_in_expressions=false
-sp_cleanup.use_this_for_non_static_field_access=false
-sp_cleanup.use_this_for_non_static_field_access_only_if_necessary=true
-sp_cleanup.use_this_for_non_static_method_access=false
-sp_cleanup.use_this_for_non_static_method_access_only_if_necessary=true

MyTracks/AndroidManifest.xml

@@ -1,27 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--
-Copyright 2010 Google Inc.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
--->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
           package="com.google.android.maps.mytracks"
-          android:installLocation="auto"
-          android:versionCode="34"
-          android:versionName="1.1.11">
+          android:versionCode="18"
+          android:versionName="1.0.17">
   <application android:icon="@drawable/arrow_icon"
-               android:label="@string/my_tracks_app_name"
-               android:name="com.google.android.apps.mytracks.MyTracksApplication"
+               android:label="@string/app_name"
                android:backupAgent="com.google.android.apps.mytracks.io.backup.MyTracksBackupAgent">
     <uses-library android:name="com.google.android.maps" />
 
@@ -29,12 +12,11 @@ limitations under the License.
                android:value="AEdPqrEAAAAIi-_QiwoRSc9_bAC9cmuNXTQyU8ajJmGtKdhskQ" />
 
     <provider android:name="com.google.android.apps.mytracks.content.MyTracksProvider"
-              android:authorities="com.google.android.maps.mytracks"
-              android:exported="true"
-              android:readPermission="com.google.android.apps.mytracks.READ_TRACK_DATA"
-              android:writePermission="com.google.android.apps.mytracks.WRITE_TRACK_DATA" />
+              android:multiprocess="true"
+              android:authorities="com.google.android.maps.mytracks" />
 
     <activity android:name="com.google.android.apps.mytracks.MyTracks"
+              android:label="My Tracks"
               android:configChanges="mcc|mnc|locale|touchscreen|keyboard|keyboardHidden|navigation|orientation|fontScale">
       <intent-filter>
         <action android:name="android.intent.action.MAIN" />
@@ -44,111 +26,6 @@ limitations under the License.
         <action android:name="android.intent.action.VIEW" />
         <category android:name="android.intent.category.DEFAULT" />
         <category android:name="android.intent.category.BROWSABLE" />
-        <data android:mimeType="vnd.android.cursor.item/vnd.google.track" />
-      </intent-filter>
-    </activity>
-
-    <activity android:name="com.google.android.apps.mytracks.MapActivity"
-              android:exported="false">
-      <intent-filter>
-        <category android:name="android.intent.category.TAB" />
-      </intent-filter>
-    </activity>
-
-    <activity android:name="com.google.android.apps.mytracks.MyMapsList"
-              android:label="@string/my_maps_list_title"
-              android:configChanges="mcc|mnc|locale|touchscreen|keyboard|keyboardHidden|navigation|orientation|fontScale"
-              android:exported="false" />
-
-    <!-- TODO: VIEW and PICK for track cursor dir -->
-    <activity android:name="com.google.android.apps.mytracks.TrackList" />
-
-    <!-- TODO: VIEW and PICK for waypoint cursor dir -->
-    <activity android:name="com.google.android.apps.mytracks.WaypointsList" />
-
-    <activity android:name="com.google.android.apps.mytracks.TrackDetails"
-              android:label="@string/track_detail_title">
-      <intent-filter>
-        <action android:name="android.intent.action.EDIT" />
-        <category android:name="android.intent.category.DEFAULT" />
-        <category android:name="android.intent.category.BROWSABLE" />
-        <data android:mimeType="vnd.android.cursor.item/vnd.google.track" />
-      </intent-filter>
-    </activity>
-
-    <activity android:name="com.google.android.apps.mytracks.DeleteTrack"
-              android:theme="@android:style/Theme.Translucent.NoTitleBar"
-              android:noHistory="true">
-      <intent-filter>
-        <action android:name="android.intent.action.DELETE" />
-        <category android:name="android.intent.category.DEFAULT" />
-        <data android:mimeType="vnd.android.cursor.item/vnd.google.track" />
-      </intent-filter>
-    </activity>
-
-    <activity android:name="com.google.android.apps.mytracks.WaypointDetails"
-              android:label="@string/marker_detail_title">
-      <intent-filter>
-        <action android:name="android.intent.action.VIEW" />
-        <action android:name="android.intent.action.EDIT" />
-        <category android:name="android.intent.category.DEFAULT" />
-        <category android:name="android.intent.category.BROWSABLE" />
-        <data android:mimeType="vnd.android.cursor.item/vnd.google.waypoint" />
-      </intent-filter>
-    </activity>
-
-    <activity android:name="com.google.android.apps.mytracks.SettingsActivity"
-              android:label="@string/settings_title" >
-      <intent-filter>
-        <category android:name="android.intent.category.PREFERENCE" />
-      </intent-filter>
-    </activity>
-
-    <activity android:name="com.google.android.apps.mytracks.AggregatedStatsActivity"
-              android:label="@string/menu_aggregated_statistics" />
-
-    <activity android:name="com.google.android.apps.mytracks.StatsActivity"
-              android:exported="false">
-      <intent-filter>
-        <category android:name="android.intent.category.TAB" />
-      </intent-filter>
-    </activity>
-
-    <activity android:name="com.google.android.apps.mytracks.SensorStateActivity"
-              android:label="@string/menu_sensor_state" />
-
-    <activity android:name="com.google.android.apps.mytracks.ChartActivity"
-              android:exported="false">
-      <intent-filter>
-        <category android:name="android.intent.category.TAB" />
-      </intent-filter>
-    </activity>
-
-    <activity android:name="com.google.android.apps.mytracks.io.sendtogoogle.SendActivity"
-              android:theme="@android:style/Theme.Translucent.NoTitleBar">
-      <intent-filter>
-        <action android:name="android.intent.action.SEND" />
-        <data android:mimeType="vnd.android.cursor.item/vnd.google.track" />
-      </intent-filter>
-    </activity>
-
-    <activity android:name="com.google.android.apps.mytracks.io.file.SaveActivity"
-              android:theme="@android:style/Theme.Translucent.NoTitleBar"
-              android:noHistory="true">
-      <intent-filter>
-        <action android:name="android.intent.action.SAVE" />
-        <data android:mimeType="vnd.android.cursor.item/vnd.google.track" />
-      </intent-filter>
-    </activity>
-
-    <activity android:name="com.google.android.apps.mytracks.io.file.ImportActivity"
-              android:theme="@android:style/Theme.Translucent.NoTitleBar"
-              android:noHistory="true">
-      <intent-filter>
-        <action android:name="android.intent.action.VIEW" />
-        <action android:name="android.intent.action.ATTACH_DATA" />
-        <category android:name="android.intent.category.DEFAULT" />
-        <category android:name="android.intent.category.BROWSABLE" />
         <data android:scheme="file" />
         <data android:mimeType="application/gpx+xml" />
         <data android:mimeType="application/gpx" />
@@ -157,117 +34,67 @@ limitations under the License.
       </intent-filter>
     </activity>
 
+    <activity android:name="com.google.android.apps.mytracks.MyTracksMap"
+              android:label="MyTracks" />
+
+    <activity android:name="com.google.android.apps.mymaps.MyMapsList"
+              android:label="@string/map_list_title"
+              android:configChanges="mcc|mnc|locale|touchscreen|keyboard|keyboardHidden|navigation|orientation|fontScale" />
+
+    <activity android:name="com.google.android.apps.mytracks.MyTracksList"
+              android:label="Recorded Tracks" />
+
+    <activity android:name="com.google.android.apps.mytracks.MyTracksWaypointsList"
+              android:label="Recorded Waypoints" />
+
+    <activity android:name="com.google.android.apps.mytracks.MyTracksDetails"
+              android:label="@string/trackdetails_title" />
+
+    <activity android:name="com.google.android.apps.mytracks.MyTracksWaypointDetails"
+              android:label="@string/waypointdetails_title" />
+
+    <activity android:name="com.google.android.apps.mytracks.MyTracksSettings"
+              android:label="@string/mytracks_settings" />
+
+    <activity android:name="com.google.android.apps.mytracks.StatsActivity"
+              android:label="@string/statistics"/>
+
+    <activity android:name="com.google.android.apps.mytracks.ChartActivity"
+              android:label="@string/elevation_label"/>
+
     <activity android:name="com.google.android.apps.mytracks.WelcomeActivity"
-              android:label="@string/welcome_title"
-              android:exported="false" />
+              android:label="@string/welcome"/>
 
     <service android:name="com.google.android.apps.mytracks.services.TrackRecordingService"
-             android:label="@string/my_tracks_recording_service"
+             android:process=":trackrecord"
+             android:label="Track Recording Service"
              android:icon="@drawable/arrow_320"
              android:enabled="true"
-             android:exported="true"
-             android:permission="com.google.android.apps.mytracks.WRITE_TRACK_DATA" />
+             android:exported="true" />
 
-    <service android:name="com.google.android.apps.mytracks.services.ControlRecordingService"
-             android:exported="false" />
-             
-    <receiver android:name="com.google.android.apps.mytracks.BootReceiver">
-      <intent-filter>
-        <action android:name="android.intent.action.BOOT_COMPLETED" />
-      </intent-filter>
-    </receiver>
-
-    <receiver android:name="com.google.android.apps.mytracks.widgets.TrackWidgetProvider">
-      <intent-filter>
-        <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
-        <action android:name="com.google.android.apps.mytracks.TRACK_STARTED" />
-        <action android:name="com.google.android.apps.mytracks.TRACK_STOPPED" />
-      </intent-filter>
-      <meta-data android:name="android.appwidget.provider"
-                 android:resource="@xml/track_widget_info" />
-    </receiver>
   </application>
 
-  <!-- Permissions to initialize service -->
-  <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
-
   <!-- Permissions for recording tracks and showing maps -->
   <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
   <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
-  <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
   <uses-permission android:name="android.permission.INTERNET" />
   <uses-permission android:name="android.permission.WAKE_LOCK" />
-  <uses-permission android:name="android.permission.BLUETOOTH" />
-  <uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />
-
-  <uses-permission android:name="com.dsi.ant.permission.ANT" />
-  <uses-permission android:name="com.dsi.ant.permission.ANT_ADMIN" />
 
   <!-- Permissions for uploading tracks -->
   <uses-permission android:name="android.permission.GET_ACCOUNTS" />
   <uses-permission android:name="android.permission.MANAGE_ACCOUNTS" />
   <uses-permission android:name="android.permission.USE_CREDENTIALS" />
   <uses-permission android:name="com.google.android.googleapps.permission.GOOGLE_AUTH" />
-  <uses-permission android:name="com.google.android.googleapps.permission.GOOGLE_AUTH.fusiontables" />
   <uses-permission android:name="com.google.android.googleapps.permission.GOOGLE_AUTH.local" />
   <uses-permission android:name="com.google.android.googleapps.permission.GOOGLE_AUTH.wise" />
   <uses-permission android:name="com.google.android.googleapps.permission.GOOGLE_AUTH.writely" />
   <uses-permission android:name="com.google.android.providers.gsf.permission.READ_GSERVICES" />
 
-  <!-- Permissions for misc services -->
-  <uses-permission android:name="android.permission.READ_PHONE_STATE" />
-
-  <!-- Exported permissions (for other apps to use our features) -->
-  <!-- Permission to get track start/end broadcasts -->
-  <permission android:name="com.google.android.apps.mytracks.TRACK_NOTIFICATIONS"
-              android:permissionGroup="android.permission-group.LOCATION"
-              android:label="@string/permission_notification_label"
-              android:description="@string/permission_notification_description"
-              android:protectionLevel="dangerous" />
-  <!-- Permission to read raw track data (points, etc.) -->
-  <permission android:name="com.google.android.apps.mytracks.READ_TRACK_DATA"
-              android:permissionGroup="android.permission-group.LOCATION"
-              android:label="@string/permission_read_label"
-              android:description="@string/permission_read_description"
-              android:protectionLevel="dangerous" />
-  <!-- Permission to write track data, either raw or by making service calls -->
-  <permission android:name="com.google.android.apps.mytracks.WRITE_TRACK_DATA"
-              android:permissionGroup="android.permission-group.LOCATION"
-              android:label="@string/permission_write_label"
-              android:description="@string/permission_write_description"
-              android:protectionLevel="dangerous" />
-
-  <!-- Permission to get MyTracks broadcasts. For internal MyTracks communication. -->
-  <permission android:name="com.google.android.apps.mytracks.MYTRACKS_NOTIFICATIONS"
-              android:permissionGroup="android.permission-group.LOCATION"
-              android:label="@string/permission_notification_label"
-              android:description="@string/permission_notification_label"
-              android:protectionLevel="signature" />
-
-  <!-- We read and write raw track data, obviously. -->
-  <uses-permission android:name="com.google.android.apps.mytracks.READ_TRACK_DATA" />
-  <uses-permission android:name="com.google.android.apps.mytracks.WRITE_TRACK_DATA" />
-  <uses-permission android:name="com.google.android.apps.mytracks.MYTRACKS_NOTIFICATIONS" />
-
-  <!-- Features required -->
-  <uses-feature android:name="android.hardware.location" android:required="true"/>
-  <uses-feature android:name="android.hardware.location.gps" android:required="true"/>
-
-  <!-- Features optional -->
-  <uses-feature android:name="android.hardware.bluetooth" android:required="false"/>
-  <uses-feature android:name="android.hardware.faketouch" android:required="false"/>
-  <uses-feature android:name="android.hardware.location.network" android:required="false"/>
-  <uses-feature android:name="android.hardware.sensor.compass" android:required="false"/>
-  <uses-feature android:name="android.hardware.telephony" android:required="false"/>
-  <uses-feature android:name="android.hardware.telephony.gsm" android:required="false"/>
-  <uses-feature android:name="android.hardware.touchscreen" android:required="false"/>
-  <uses-feature android:name="android.hardware.touchscreen.multitouch" android:required="false"/>
-
   <uses-sdk android:minSdkVersion="3"/>
   <supports-screens
-          android:xlargeScreens="true"
           android:largeScreens="true"
           android:normalScreens="true"
           android:smallScreens="true"
           android:anyDensity="true" />
 </manifest>
+

MyTracks/MyTracks.launch

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <launchConfiguration type="com.android.ide.eclipse.adt.debug.LaunchConfigType">
 <intAttribute key="com.android.ide.eclipse.adt.action" value="0"/>
 <stringAttribute key="com.android.ide.eclipse.adt.commandline" value=""/>
@@ -9,15 +9,13 @@
 <booleanAttribute key="com.android.ide.eclipse.adt.wipedata" value="false"/>
 <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
 <listEntry value="/MyTracks"/>
-<listEntry value="/MyTracks/AndroidManifest.xml"/>
 </listAttribute>
 <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
 <listEntry value="4"/>
-<listEntry value="1"/>
 </listAttribute>
 <listAttribute key="org.eclipse.debug.ui.favoriteGroups">
-<listEntry value="org.eclipse.debug.ui.launchGroup.run"/>
 <listEntry value="org.eclipse.debug.ui.launchGroup.debug"/>
+<listEntry value="org.eclipse.debug.ui.launchGroup.run"/>
 </listAttribute>
 <booleanAttribute key="org.eclipse.jdt.launching.ALLOW_TERMINATE" value="true"/>
 <stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="MyTracks"/>

MyTracks/default.properties

@@ -1,13 +1,13 @@
 # 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,
-# "ant.properties", and override values to adapt the script to your
+# "build.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:14
+target=Google Inc.:Google APIs:8

MyTracks/libs/README.txt

@@ -1,22 +0,0 @@
-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.
-
-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.
-- 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.
-- google-api-client-1.5.0-beta.jar also depends on xpp3-1.1.4c.jar, however,
-  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
-
-libGoogleAnalytics.jar
-- see http://code.google.com/mobile/analytics/docs/.

MyTracks/proguard.cfg

@@ -1,75 +0,0 @@
--target 6
--optimizationpasses 5
--dontusemixedcaseclassnames
--dontskipnonpubliclibraryclasses
--dontpreverify
--verbose
--optimizations !code/simplification/arithmetic,!field/*,!class/merging/*
-
-# Add the libraries, but ignore warnings about them
--libraryjars libs
--libraryjars ../MyTracksLib/libs
--dontwarn com.google.android.googleapps.**
--dontwarn com.android.common.**
--dontwarn com.google.android.gsf.**
--dontwarn org.codehaus.**
--dontwarn com.google.appengine.**
--dontwarn org.apache.avalon.framework.logger.**
--dontwarn org.apache.log.**
--dontwarn org.apache.log4j.**
--dontwarn javax.servlet.**
-
-# 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.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 * {
-    native <methods>;
-}
-
--keepclasseswithmembernames class * {
-    public <init>(android.content.Context, android.util.AttributeSet);
-}
-
--keepclasseswithmembernames class * {
-    public <init>(android.content.Context, android.util.AttributeSet, int);
-}
-
--keepclassmembers enum * {
-    public static **[] values();
-    public static ** valueOf(java.lang.String);
-}
-
--keep class * implements android.os.Parcelable {
-  public static final android.os.Parcelable$Creator *;
-}
-
-# Needed by google-api-client to keep generic types and @Key annotations accessed via reflection
-
--keepclassmembers class * {
-  @com.google.api.client.util.Key <fields>;
-}
-
--keepattributes Signature,RuntimeVisibleAnnotations,AnnotationDefault
-
-# 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
-

MyTracks/res/drawable/btn_arrow_left.xml

@@ -17,11 +17,11 @@ limitations under the License.
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
 
   <item android:state_window_focused="false"
-        android:drawable="@drawable/left_arrow_track" />
+      android:drawable="@drawable/btn_arrow_left_default" />
 
   <item android:state_pressed="true"
-        android:drawable="@drawable/left_arrow_track_press" />
+      android:drawable="@drawable/btn_arrow_left_press" />
 
-  <item android:drawable="@drawable/left_arrow_track" />
+  <item android:drawable="@drawable/btn_arrow_left_default" />
 
 </selector>

MyTracks/res/drawable/btn_arrow_right.xml

@@ -17,11 +17,11 @@ limitations under the License.
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
 
   <item android:state_window_focused="false"
-        android:drawable="@drawable/right_arrow_chart" />
+      android:drawable="@drawable/btn_arrow_right_default" />
 
   <item android:state_pressed="true"
-        android:drawable="@drawable/right_arrow_chart_press" />
+      android:drawable="@drawable/btn_arrow_right_press" />
 
-  <item android:drawable="@drawable/right_arrow_chart" />
+  <item android:drawable="@drawable/btn_arrow_right_default" />
 
 </selector>

MyTracks/res/drawable/left_arrow_chart_stateful.xml

@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-Copyright 2010 Google Inc.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
--->
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-
-  <item android:state_window_focused="false"
-        android:drawable="@drawable/left_arrow_chart" />
-
-  <item android:state_pressed="true"
-        android:drawable="@drawable/left_arrow_chart_press" />
-
-  <item android:drawable="@drawable/left_arrow_chart" />
-
-</selector>

MyTracks/res/drawable/left_arrow_stats_stateful.xml

@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-Copyright 2010 Google Inc.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
--->
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-
-  <item android:state_window_focused="false"
-        android:drawable="@drawable/left_arrow_stats" />
-
-  <item android:state_pressed="true"
-        android:drawable="@drawable/left_arrow_stats_press" />
-
-  <item android:drawable="@drawable/left_arrow_stats" />
-
-</selector>

MyTracks/res/drawable/right_arrow_stats_stateful.xml

@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-Copyright 2010 Google Inc.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
--->
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-
-  <item android:state_window_focused="false"
-        android:drawable="@drawable/right_arrow_stats" />
-
-  <item android:state_pressed="true"
-        android:drawable="@drawable/right_arrow_stats_press" />
-
-  <item android:drawable="@drawable/right_arrow_stats" />
-
-</selector>

MyTracks/res/drawable/right_arrow_track_stateful.xml

@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-Copyright 2010 Google Inc.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
--->
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-
-  <item android:state_window_focused="false"
-        android:drawable="@drawable/right_arrow_track" />
-
-  <item android:state_pressed="true"
-        android:drawable="@drawable/right_arrow_track_press" />
-
-  <item android:drawable="@drawable/right_arrow_track" />
-
-</selector>

MyTracks/res/layout/about.xml

@@ -31,17 +31,18 @@ limitations under the License.
       <TextView
         android:layout_height="wrap_content"
         android:layout_width="wrap_content"
-        android:text="@string/my_tracks_app_name"
+        android:text="@string/app_name"
         android:textSize="30sp" />
       <TextView
         android:layout_height="wrap_content"
         android:layout_width="wrap_content"
-        android:text="@string/about_copyright_notice"
+        android:text="@string/about_copyright_message"
         android:textSize="15sp" />
     </LinearLayout>
   </TableRow>
 
-  <View android:layout_height="2dip" />
+  <View
+    android:layout_height="2dip" />
 
   <TableRow>
     <TextView
@@ -57,21 +58,11 @@ limitations under the License.
       android:layout_height="wrap_content"
       android:layout_width="wrap_content"
       android:orientation="vertical">
-      <TextView
-        android:layout_height="wrap_content"
-        android:layout_width="wrap_content"
-        android:text="@string/about_bart"
-        android:textSize="20sp" />
       <TextView
         android:layout_height="wrap_content"
         android:layout_width="wrap_content"
         android:text="@string/about_dylan"
         android:textSize="20sp" />
-      <TextView
-        android:layout_height="wrap_content"
-        android:layout_width="wrap_content"
-        android:text="@string/about_jimmy"
-        android:textSize="20sp" />
       <TextView
         android:layout_height="wrap_content"
         android:layout_width="wrap_content"
@@ -80,7 +71,7 @@ limitations under the License.
       <TextView
         android:layout_height="wrap_content"
         android:layout_width="wrap_content"
-        android:text="@string/about_rodrigo"
+        android:text="@string/about_rdamazio"
         android:textSize="20sp" />
       <TextView
         android:layout_height="wrap_content"
@@ -90,7 +81,8 @@ limitations under the License.
     </LinearLayout>
   </TableRow>
 
-  <View android:layout_height="2dip" />
+  <View
+    android:layout_height="2dip" />
 
   <TableRow>
     <TextView
@@ -105,11 +97,12 @@ limitations under the License.
       android:layout_height="wrap_content"
       android:id="@+id/about_version_register"
       android:layout_width="wrap_content"
-      android:text="@string/value_unknown"
+      android:text="@string/unknown"
       android:textSize="20sp" />
   </TableRow>
 
-  <View android:layout_height="2dip" />
+  <View
+    android:layout_height="2dip" />
 
   <TableRow>
     <TextView
@@ -124,29 +117,11 @@ limitations under the License.
       android:autoLink="web"
       android:layout_height="wrap_content"
       android:layout_width="wrap_content"
-      android:text="@string/my_tracks_web_url"
+      android:text="@string/about_weburl"
       android:textSize="18sp" />
   </TableRow>
 
-  <View android:layout_height="2dip" />
-  
-  <TableRow>
-    <TextView
-      android:paddingLeft="10dip"
-      android:paddingRight="10dip"
-      android:layout_column="1"
-      android:layout_height="wrap_content"
-      android:layout_width="wrap_content"
-      android:text="@string/about_privacy"
-      android:textSize="20sp" />
-    <TextView
-      android:autoLink="web"
-      android:layout_height="wrap_content"
-      android:layout_width="wrap_content"
-      android:text="@string/my_tracks_privacy_url"
-      android:textSize="18sp" />
-  </TableRow>
-  
-  <View android:layout_height="4dip" />
+  <View
+    android:layout_height="4dip" />
 
 </TableLayout>

MyTracks/res/layout/chart_settings.xml

@@ -26,7 +26,7 @@ limitations under the License.
     <TextView
       android:layout_width="fill_parent"
       android:layout_height="wrap_content"
-      android:text="@string/menu_chart_view_chart_settings"
+      android:text="@string/chart_settings"
       android:textSize="20dip"
       android:textColor="#fff"
       android:layout_marginLeft="10dip"/>
@@ -57,7 +57,7 @@ limitations under the License.
             <TextView
               android:layout_width="fill_parent"
               android:layout_height="wrap_content"
-              android:text="@string/chart_settings_x_axis"
+              android:text="@string/x_axis"
               android:textSize="20dip" />
           </LinearLayout>
           <RadioGroup  android:id="@+id/chart_settings_x"
@@ -66,11 +66,11 @@ limitations under the License.
             <RadioButton android:id="@+id/chart_settings_by_distance"
               android:layout_width="fill_parent"
               android:layout_height="wrap_content"
-              android:text="@string/chart_settings_by_distance"/>
+              android:text="@string/by_distance"/>
             <RadioButton android:id="@+id/chart_settings_by_time"
               android:layout_width="fill_parent"
               android:layout_height="wrap_content"
-              android:text="@string/chart_settings_by_time"/>
+              android:text="@string/by_time"/>
           </RadioGroup>
         </LinearLayout>
       </TableRow>
@@ -90,48 +90,44 @@ limitations under the License.
             <TextView
               android:layout_width="fill_parent"
               android:layout_height="wrap_content"
-              android:text="@string/chart_settings_y_axis"
+              android:text="@string/y_axis"
               android:textSize="20dip" />
           </LinearLayout>
           <CheckBox android:id="@+id/chart_settings_elevation"
             android:checked="true"
             android:layout_width="fill_parent"
             android:layout_height="wrap_content"
-            android:text="@string/stat_elevation"/>
+            android:text="@string/elevation"/>
           <CheckBox android:id="@+id/chart_settings_speed"
             android:checked="true"
             android:layout_width="fill_parent"
             android:layout_height="wrap_content"
-            android:text="@string/stat_speed"/>
-          <CheckBox android:id="@+id/chart_settings_power"
-            android:checked="true"
-            android:layout_width="fill_parent"
-            android:layout_height="wrap_content"
-            android:text="@string/sensor_state_power"/>
-          <CheckBox android:id="@+id/chart_settings_cadence"
-            android:checked="true"
-            android:layout_width="fill_parent"
-            android:layout_height="wrap_content"
-            android:text="@string/sensor_state_cadence"/>
-          <CheckBox android:id="@+id/chart_settings_heart_rate"
-            android:checked="true"
-            android:layout_width="fill_parent"
-            android:layout_height="wrap_content"
-            android:text="@string/sensor_state_heart_rate"/>
+            android:text="@string/speed"/>
         </LinearLayout>
       </TableRow>
     </TableLayout>
   </ScrollView>
-  <LinearLayout style="@style/ButtonLayout">
-    <LinearLayout style="@style/ButtonSpacer"/>
-    <Button android:id="@+id/chart_settings_ok"
-      android:layout_gravity="left"
-      android:text="@string/generic_ok"
-      style="@style/Button"/>
+  <LinearLayout
+    android:orientation="horizontal"
+    android:layout_width="fill_parent"
+    android:layout_height="wrap_content"
+    android:background="@drawable/list_bar"
+    android:padding="3dip">
     <Button android:id="@+id/chart_settings_cancel"
+      android:layout_width="wrap_content"
+      android:layout_height="48dip"
       android:layout_gravity="right"
-      android:text="@string/generic_cancel"
-      style="@style/Button"/>
-    <LinearLayout style="@style/ButtonSpacer"/>
+      android:text="@string/cancel"
+      android:textSize="14dip"/>
+    <TextView
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      android:layout_weight="1"/>
+    <Button android:id="@+id/chart_settings_ok"
+      android:layout_width="wrap_content"
+      android:layout_height="48dip"
+      android:layout_gravity="right"
+      android:text="@string/ok"
+      android:textSize="14dip"/>
   </LinearLayout>
 </LinearLayout>

MyTracks/res/layout/list.xml

@@ -31,7 +31,7 @@ limitations under the License.
       android:layout_height="wrap_content"
       android:textSize="16dip"
       android:textColor="#fff"
-      android:text="@string/my_maps_list_pick_map"
+      android:text="@string/select_map_message"
       android:layout_weight="0"/>
   </LinearLayout>
   <ListView android:id="@+id/maplist"
@@ -47,7 +47,7 @@ limitations under the License.
       android:textSize="16dip"
       android:textColor="#c00"
       android:textStyle="bold"
-      android:text="@string/my_maps_list_no_maps"
+      android:text="@string/mapslist_no_maps_available"
       android:visibility="gone"/>
     <TextView android:id="@+id/failed"
     android:layout_width="fill_parent"
@@ -58,7 +58,7 @@ limitations under the License.
     android:textSize="16dip"
     android:textColor="#c00"
     android:textStyle="bold"
-    android:text="@string/my_maps_list_error"
+    android:text="@string/maps_list_failed"
     android:visibility="gone"/>
     <LinearLayout
     android:orientation="horizontal"
@@ -89,7 +89,7 @@ limitations under the License.
           android:textSize="16dip"
           android:textColor="#fff"
           android:textStyle="bold"
-          android:text="@string/my_maps_list_loading"/>
+          android:text="@string/maps_list_loading"/>
         <TextView
           android:layout_width="wrap_content"
           android:layout_height="wrap_content"

MyTracks/res/layout/mytracks_detail.xml

@@ -20,7 +20,7 @@ limitations under the License.
   android:layout_height="fill_parent"
   android:paddingTop="10dip"
   android:background="#c000">
-  <TextView android:text="@string/track_detail_track_name"
+  <TextView android:text="@string/trackdetails_name"
     android:layout_width="fill_parent"
     android:layout_height="wrap_content"/>
   <LinearLayout
@@ -40,20 +40,16 @@ limitations under the License.
       android:singleLine="true"
       android:autoText="true"
       android:capitalize="words"
-      android:selectAllOnFocus="true"
-      android:hint="@string/track_detail_track_name"
-      android:imeOptions="actionNext"/>
+      android:selectAllOnFocus="true"/>
   </LinearLayout>
-  <TextView android:text="@string/track_detail_activity_type"
+  <TextView android:text="@string/trackdetails_category"
     android:layout_width="fill_parent"
     android:layout_height="wrap_content"/>
   <AutoCompleteTextView android:id="@+id/trackdetails_category"
     android:layout_width="fill_parent"
     android:layout_height="wrap_content"
-    android:singleLine="true"
-    android:hint="@string/track_detail_activity_type_hint"
-    android:imeOptions="actionNext"/>
-  <TextView android:text="@string/track_detail_track_description"
+    android:singleLine="true"/>
+  <TextView android:text="@string/trackdetails_description"
     android:layout_width="fill_parent"
     android:layout_height="wrap_content"/>
   <EditText android:id="@+id/trackdetails_description"
@@ -65,19 +61,28 @@ limitations under the License.
     android:selectAllOnFocus="true"
     android:maxLines="50"
     android:gravity="top"
-    android:layout_weight="1"
-    android:hint="@string/track_detail_track_description"
-    android:imeOptions="actionDone"/>
-  <LinearLayout style="@style/ButtonLayout">
-    <LinearLayout style="@style/ButtonSpacer"/>
-    <Button android:id="@+id/trackdetails_save"
-      android:layout_gravity="left"
-      android:text="@string/generic_save"
-      style="@style/Button"/>
-    <Button android:id="@+id/trackdetails_cancel"
-      android:layout_gravity="right"
-      android:text="@string/generic_cancel"
-      style="@style/Button"/>
-    <LinearLayout style="@style/ButtonSpacer"/>
-  </LinearLayout>
+    android:layout_weight="1"/>
+    <LinearLayout
+      android:orientation="horizontal"
+      android:layout_width="fill_parent"
+      android:layout_height="wrap_content"
+      android:background="@drawable/list_bar"
+      android:padding="3dip">
+      <Button android:id="@+id/trackdetails_cancel"
+        android:layout_width="wrap_content"
+        android:layout_height="48dip"
+        android:layout_gravity="right"
+        android:text="@string/cancel"
+        android:textSize="14dip"/>
+      <TextView
+        android:layout_width="0dip"
+        android:layout_height="wrap_content"
+        android:layout_weight="1"/>
+      <Button android:id="@+id/trackdetails_save"
+        android:layout_width="wrap_content"
+        android:layout_height="48dip"
+        android:layout_gravity="right"
+        android:text="@string/save"
+        android:textSize="14dip"/>
+   </LinearLayout>
 </LinearLayout>

MyTracks/res/layout/mytracks_elevation.xml

@@ -30,15 +30,13 @@ limitations under the License.
     android:orientation="vertical"
     android:layout_width="fill_parent"
     android:layout_height="fill_parent"
-    android:padding="10dip"
     android:layout_weight="0">
     <ZoomControls android:id="@+id/elevation_zoom"
       android:layout_width="wrap_content"
       android:layout_height="wrap_content"
       android:layout_gravity="center_horizontal"
       android:layout_alignParentBottom="true"
-      android:layout_centerHorizontal="true"
-      android:layout_alignParentRight="true"/>
+      android:layout_centerHorizontal="true"/>
   </RelativeLayout>
   <LinearLayout android:id="@+id/elevation_busypane"
     android:orientation="vertical"

MyTracks/res/layout/mytracks_layout.xml

@@ -41,7 +41,7 @@ limitations under the License.
       android:layout_height="wrap_content"
       android:textSize="16dip"
       android:textColor="#fff"
-      android:text="@string/gps_wait_for_fix"
+      android:text="@string/wait_for_fix"
       android:layout_weight="0"/>
     </LinearLayout>
     <LinearLayout android:id="@+id/busypane"

MyTracks/res/layout/mytracks_list.xml

@@ -32,27 +32,35 @@ limitations under the License.
       android:layout_height="wrap_content"
       android:textSize="16dip"
       android:textColor="#fff"
-      android:text="@string/track_list_pick_one"
+      android:text="@string/tracklist_pick_one"
       android:layout_weight="0"/>
   </LinearLayout>
   <ListView android:id="@android:id/list"
     android:layout_width="fill_parent"
     android:layout_height="wrap_content"
     android:layout_weight="1"/>
-  <LinearLayout style="@style/ButtonLayout">
-    <LinearLayout style="@style/ButtonSpacer"/>
-    <Button android:id="@+id/tracklist_btn_import_all"
-      android:layout_gravity="left"
-      android:text="@string/track_list_import_all"
-      style="@style/Button"/>
+  <LinearLayout
+    android:orientation="horizontal"
+    android:layout_width="fill_parent"
+    android:layout_height="wrap_content"
+    android:background="@drawable/list_bar"
+    android:layout_weight="0"
+    android:padding="3dip">
+    <TextView
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      android:layout_weight="1"/>
     <Button android:id="@+id/tracklist_btn_export_all"
-      android:layout_gravity="center_horizontal"
-      android:text="@string/track_list_export_all"
-      style="@style/Button"/>
+      android:layout_width="wrap_content"
+      android:layout_height="48dip"
+      android:layout_gravity="left|top"
+      android:text="@string/tracklist_btn_export_all"
+      android:textSize="14dip"/>
     <Button android:id="@+id/tracklist_btn_delete_all"
-      android:layout_gravity="right"
-      android:text="@string/track_list_delete_all"
-      style="@style/Button"/>
-    <LinearLayout style="@style/ButtonSpacer"/>
-  </LinearLayout>
+      android:layout_width="wrap_content"
+      android:layout_height="48dip"
+      android:layout_gravity="left|top"
+      android:text="@string/tracklist_btn_delete_all"
+      android:textSize="14dip"/>
+   </LinearLayout>
 </LinearLayout>

MyTracks/res/layout/mytracks_send_to_google.xml

@@ -26,7 +26,7 @@ limitations under the License.
     <TextView
       android:layout_width="fill_parent"
       android:layout_height="wrap_content"
-      android:text="@string/send_google_title"
+      android:text="@string/sendtogoogle_title"
       android:textSize="20dip"
       android:textColor="#fff"
       android:layout_marginLeft="10dip"/>
@@ -41,8 +41,6 @@ limitations under the License.
       android:stretchColumns="1"
       android:layout_marginTop="5dip"
       android:layout_marginLeft="5dip">
-      
-      <!-- My Maps -->
       <TableRow>
         <ImageView android:src="@drawable/mymaps_icon"
           android:layout_width="wrap_content"
@@ -55,7 +53,7 @@ limitations under the License.
           <CheckBox android:id="@+id/sendtogoogle_google_mymaps"
             android:layout_width="fill_parent"
             android:layout_height="wrap_content"
-            android:text="@string/send_google_my_maps"
+            android:text="@string/sendtogoogle_google_mymaps"
             android:textSize="20dip"
             android:checked="true"/>
           <RadioGroup android:id="@+id/sendtogoogle_group_mymaps"
@@ -64,35 +62,14 @@ limitations under the License.
             <RadioButton android:id="@+id/sendtogoogle_create_new_map"
               android:layout_width="fill_parent"
               android:layout_height="wrap_content"
-              android:text="@string/send_google_new_map"/>
+              android:text="@string/sendtogoogle_create_new_map"/>
             <RadioButton android:id="@+id/sendtogoogle_pick_existing_map"
               android:layout_width="fill_parent"
               android:layout_height="wrap_content"
-              android:text="@string/send_google_existing_map"/>
+              android:text="@string/sendtogoogle_pick_existing_map"/>
           </RadioGroup>
         </LinearLayout>
       </TableRow>
-
-      <!-- Fusion Tables -->
-      <TableRow>
-        <ImageView android:src="@drawable/googledocs_icon"
-          android:layout_width="wrap_content"
-          android:layout_height="wrap_content"/>
-        <LinearLayout
-          android:layout_width="fill_parent"
-          android:layout_height="wrap_content"
-          android:orientation="vertical"
-          android:layout_marginLeft="10dip">
-          <CheckBox android:id="@+id/sendtogoogle_google_fusiontables"
-            android:layout_width="fill_parent"
-            android:layout_height="wrap_content"
-            android:text="@string/send_google_fusion_tables"
-            android:textSize="20dip"
-            android:checked="true"/>
-        </LinearLayout>
-      </TableRow>
-
-      <!-- Google Docs -->
       <TableRow>
         <ImageView android:src="@drawable/googledocs_icon"
           android:layout_width="wrap_content"
@@ -105,23 +82,48 @@ limitations under the License.
           <CheckBox android:id="@+id/sendtogoogle_google_docs"
             android:layout_width="fill_parent"
             android:layout_height="wrap_content"
-            android:text="@string/send_google_docs"
+            android:text="@string/sendtogoogle_google_docs"
             android:textSize="20dip"
             android:checked="true"/>
+          <RadioGroup android:id="@+id/sendtogoogle_group_docs"
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:visibility="gone">
+            <RadioButton android:id="@+id/sendtogoogle_send_stats"
+              android:layout_width="fill_parent"
+              android:layout_height="wrap_content"
+              android:text="@string/sendtogoogle_send_stats"/>
+            <RadioButton android:id="@+id/sendtogoogle_send_stats_and_points"
+              android:layout_width="fill_parent"
+              android:layout_height="wrap_content"
+              android:text="@string/sendtogoogle_send_stats_and_points"
+              android:enabled="false"/>
+          </RadioGroup>
         </LinearLayout>
       </TableRow>
     </TableLayout>
   </ScrollView>
-  <LinearLayout style="@style/ButtonLayout">
-    <LinearLayout style="@style/ButtonSpacer"/>
-    <Button android:id="@+id/sendtogoogle_send_now"
-      android:layout_gravity="left"
-      android:text="@string/send_google_send_now"
-      style="@style/Button"/>
+  <LinearLayout
+    android:orientation="horizontal"
+    android:layout_width="fill_parent"
+    android:layout_height="wrap_content"
+    android:background="@drawable/list_bar"
+    android:padding="3dip">
     <Button android:id="@+id/sendtogoogle_cancel"
+      android:layout_width="wrap_content"
+      android:layout_height="48dip"
       android:layout_gravity="right"
-      android:text="@string/generic_cancel"
-      style="@style/Button"/>
-    <LinearLayout style="@style/ButtonSpacer"/>
+      android:text="@string/cancel"
+      android:textSize="14dip"/>
+    <TextView
+      android:layout_width="0dip"
+      android:layout_height="wrap_content"
+      android:layout_weight="1"/>
+    <Button android:id="@+id/sendtogoogle_send_now"
+      android:layout_width="wrap_content"
+      android:layout_height="48dip"
+      android:layout_gravity="right"
+      android:text="@string/sendtogoogle_send_now"
+      android:textSize="14dip"/>
   </LinearLayout>
 </LinearLayout>

MyTracks/res/layout/mytracks_waypoint_details.xml

@@ -30,7 +30,7 @@ limitations under the License.
       android:layout_width="fill_parent"
       android:layout_height="fill_parent"
       android:orientation="vertical">
-      <TextView android:text="@string/marker_detail_marker_name"
+      <TextView android:text="@string/waypointdetails_name"
         android:layout_width="fill_parent"
         android:layout_height="wrap_content"/>
       <LinearLayout
@@ -50,9 +50,7 @@ limitations under the License.
          android:singleLine="true"
          android:autoText="true"
          android:capitalize="words"
-         android:selectAllOnFocus="true"
-         android:hint="@string/marker_detail_marker_name"
-         android:imeOptions="actionNext"/>
+         android:selectAllOnFocus="true"/>
       </LinearLayout>
       <LinearLayout android:id="@+id/waypointdetails_description_layout"
         android:orientation="vertical"
@@ -61,16 +59,14 @@ limitations under the License.
         android:visibility="visible"
         android:layout_weight="1">
         <TextView android:id="@+id/waypointdetails_category_label"
-          android:text="@string/marker_detail_marker_type"
+          android:text="@string/waypointdetails_category"
           android:layout_width="fill_parent"
           android:layout_height="wrap_content"/>
         <AutoCompleteTextView android:id="@+id/waypointdetails_category"
           android:layout_width="fill_parent"
           android:layout_height="wrap_content"
-          android:singleLine="true"
-          android:hint="@string/marker_detail_marker_type_hint"
-          android:imeOptions="actionNext"/>
-        <TextView android:text="@string/marker_detail_marker_description"
+          android:singleLine="true"/>
+        <TextView android:text="@string/waypointdetails_description"
           android:layout_width="fill_parent"
           android:layout_height="wrap_content"/>
         <EditText android:id="@+id/waypointdetails_description"
@@ -83,9 +79,7 @@ limitations under the License.
           android:minLines="5"
           android:maxLines="50"
           android:gravity="top"
-          android:layout_weight="1"
-          android:hint="@string/marker_detail_marker_description"
-          android:imeOptions="actionDone"/>
+          android:layout_weight="1"/>
       </LinearLayout>
 
       <TableLayout android:id="@+id/waypoint_stats"
@@ -101,12 +95,12 @@ limitations under the License.
             android:id="@+id/total_distance_label"
             android:layout_column="1"
             android:layout_span="3"
-            android:text="@string/stat_total_distance" />
+            android:text="@string/total_distance_label" />
           <TextView
             android:id="@+id/max_speed_label"
             android:layout_column="4"
             android:layout_span="2"
-            android:text="@string/stat_max_speed" />
+            android:text="@string/max_speed_label" />
         </TableRow>
         <TableRow
           android:background="@color/stat_label_background">
@@ -116,7 +110,7 @@ limitations under the License.
             android:layout_column="1"
             android:layout_marginBottom="-9dip"
             android:layout_marginTop="-9dip"
-            android:text="@string/value_unknown"
+            android:text="@string/unknown"
             android:textColor="@color/stat_label_text"
             android:textSize="40sp" />
           <TextView
@@ -125,7 +119,7 @@ limitations under the License.
             android:layout_column="2"
             android:layout_marginBottom="-9dip"
             android:layout_marginTop="-9dip"
-            android:text="@string/unit_mile"
+            android:text="@string/mile"
             android:textColor="@color/stat_label_text" />
           <!-- TODO 4/08/2009
           The following is a bad hack to get a spacer the same size as the
@@ -145,7 +139,7 @@ limitations under the License.
             android:layout_column="4"
             android:layout_marginBottom="-9dip"
             android:layout_marginTop="-9dip"
-            android:text="@string/value_unknown"
+            android:text="@string/unknown"
             android:textColor="@color/stat_label_text"
             android:textSize="40sp" />
           <LinearLayout
@@ -183,12 +177,12 @@ limitations under the License.
             android:id="@+id/track_time_label"
             android:layout_column="1"
             android:layout_span="3"
-            android:text="@string/stat_total_time" />
+            android:text="@string/total_time_label" />
           <TextView
             android:id="@+id/average_speed_label"
             android:layout_column="4"
             android:layout_span="2"
-            android:text="@string/stat_average_speed" />
+            android:text="@string/average_speed_label" />
         </TableRow>
         <TableRow
           android:background="@color/stat_label_background">
@@ -201,7 +195,7 @@ limitations under the License.
             android:layout_marginTop="-9dip"
             android:layout_span="2"
             android:layout_width="fill_parent"
-            android:text="@string/value_unknown"
+            android:text="@string/unknown"
             android:textColor="@color/stat_label_text"
             android:textSize="40sp" />
           <TextView
@@ -217,7 +211,7 @@ limitations under the License.
             android:layout_column="4"
             android:layout_marginBottom="-9dip"
             android:layout_marginTop="-9dip"
-            android:text="@string/value_unknown"
+            android:text="@string/unknown"
             android:textColor="@color/stat_label_text"
             android:textSize="40sp" />
           <LinearLayout
@@ -255,12 +249,12 @@ limitations under the License.
             android:id="@+id/moving_time_label"
             android:layout_column="1"
             android:layout_span="3"
-            android:text="@string/stat_moving_time" />
+            android:text="@string/moving_time_label" />
           <TextView
             android:id="@+id/average_moving_speed_label"
             android:layout_column="4"
             android:layout_span="2"
-            android:text="@string/stat_average_moving_speed" />
+            android:text="@string/average_moving_speed_label" />
         </TableRow>
         <TableRow
           android:background="@color/stat_label_background">
@@ -273,7 +267,7 @@ limitations under the License.
             android:layout_marginTop="-9dip"
             android:layout_width="fill_parent"
             android:layout_span="2"
-            android:text="@string/value_unknown"
+            android:text="@string/unknown"
             android:textColor="@color/stat_label_text"
             android:textSize="40sp" />
           <TextView
@@ -289,7 +283,7 @@ limitations under the License.
             android:layout_column="4"
             android:layout_marginBottom="-9dip"
             android:layout_marginTop="-9dip"
-            android:text="@string/value_unknown"
+            android:text="@string/unknown"
             android:textColor="@color/stat_label_text"
             android:textSize="40sp" />
           <LinearLayout
@@ -327,12 +321,12 @@ limitations under the License.
             android:id="@+id/elevation_label"
             android:layout_column="1"
             android:layout_span="3"
-            android:text="@string/stat_elevation" />
+            android:text="@string/elevation_label" />
           <TextView
             android:id="@+id/elevation_gain_label"
             android:layout_column="4"
             android:layout_span="2"
-            android:text="@string/stat_elevation_gain" />
+            android:text="@string/elevation_gain_label" />
         </TableRow>
         <TableRow
           android:background="@color/stat_label_background">
@@ -342,7 +336,7 @@ limitations under the License.
             android:layout_column="1"
             android:layout_marginBottom="-9dip"
             android:layout_marginTop="-9dip"
-            android:text="@string/value_unknown"
+            android:text="@string/unknown"
             android:textColor="@color/stat_label_text"
             android:textSize="40sp" />
           <TextView
@@ -351,7 +345,7 @@ limitations under the License.
             android:layout_column="2"
             android:layout_marginBottom="-9dip"
             android:layout_marginTop="-9dip"
-            android:text="@string/unit_feet"
+            android:text="@string/feet"
             android:textColor="@color/stat_label_text"/>
           <TextView
             android:background="@color/black"
@@ -366,7 +360,7 @@ limitations under the License.
             android:layout_column="4"
             android:layout_marginBottom="-9dip"
             android:layout_marginTop="-9dip"
-            android:text="@string/value_unknown"
+            android:text="@string/unknown"
             android:textColor="@color/stat_label_text"
             android:textSize="40sp" />
           <TextView
@@ -375,7 +369,7 @@ limitations under the License.
             android:layout_column="5"
             android:layout_marginBottom="-9dip"
             android:layout_marginTop="-9dip"
-            android:text="@string/unit_feet"
+            android:text="@string/feet"
             android:textColor="@color/stat_label_text" />
         </TableRow>
 
@@ -385,12 +379,12 @@ limitations under the License.
             android:id="@+id/min_elevation_label"
             android:layout_column="1"
             android:layout_span="3"
-            android:text="@string/stat_min_elevation" />
+            android:text="@string/min_elevation_label" />
           <TextView
             android:id="@+id/max_elevation_label"
             android:layout_column="4"
             android:layout_span="3"
-            android:text="@string/stat_max_elevation" />
+            android:text="@string/max_elevation_label" />
         </TableRow>
         <TableRow
           android:background="@color/stat_label_background">
@@ -400,7 +394,7 @@ limitations under the License.
             android:layout_column="1"
             android:layout_marginBottom="-9dip"
             android:layout_marginTop="-9dip"
-            android:text="@string/value_unknown"
+            android:text="@string/unknown"
             android:textColor="@color/stat_label_text"
             android:textSize="40sp" />
           <TextView
@@ -409,7 +403,7 @@ limitations under the License.
             android:layout_column="2"
             android:layout_marginBottom="-9dip"
             android:layout_marginTop="-9dip"
-            android:text="@string/unit_feet"
+            android:text="@string/feet"
             android:textColor="@color/stat_label_text" />
           <TextView
             android:background="@color/black"
@@ -424,7 +418,7 @@ limitations under the License.
             android:layout_column="4"
             android:layout_marginBottom="-9dip"
             android:layout_marginTop="-9dip"
-            android:text="@string/value_unknown"
+            android:text="@string/unknown"
             android:textColor="@color/stat_label_text"
             android:textSize="40sp" />
           <TextView
@@ -433,7 +427,7 @@ limitations under the License.
             android:layout_column="5"
             android:layout_marginBottom="-9dip"
             android:layout_marginTop="-9dip"
-            android:text="@string/unit_feet"
+            android:text="@string/feet"
             android:textColor="@color/stat_label_text" />
         </TableRow>
 
@@ -443,12 +437,12 @@ limitations under the License.
             android:id="@+id/min_grade_label"
             android:layout_column="1"
             android:layout_span="3"
-            android:text="@string/stat_min_grade" />
+            android:text="@string/min_grade_label" />
           <TextView
             android:id="@+id/max_grade_label"
             android:layout_column="4"
             android:layout_span="2"
-            android:text="@string/stat_max_grade" />
+            android:text="@string/max_grade_label" />
         </TableRow>
         <TableRow
           android:background="@color/stat_label_background">
@@ -461,7 +455,7 @@ limitations under the License.
             android:layout_marginTop="-9dip"
             android:layout_width="fill_parent"
             android:layout_span="2"
-            android:text="@string/value_unknown"
+            android:text="@string/unknown"
             android:textColor="@color/stat_label_text"
             android:textSize="40sp" />
           <TextView
@@ -480,23 +474,36 @@ limitations under the License.
             android:layout_marginTop="-9dip"
             android:layout_width="fill_parent"
             android:layout_span="2"
-            android:text="@string/value_unknown"
+            android:text="@string/unknown"
             android:textColor="@color/stat_label_text"
             android:textSize="40sp" />
         </TableRow>
       </TableLayout>
     </LinearLayout>
   </ScrollView>
-  <LinearLayout style="@style/ButtonLayout">
-    <LinearLayout style="@style/ButtonSpacer"/>
-    <Button android:id="@+id/waypointdetails_save"
-      android:layout_gravity="left"
-      android:text="@string/generic_save"
-      style="@style/Button"/>
+
+  <LinearLayout
+      android:orientation="horizontal"
+      android:layout_width="fill_parent"
+      android:layout_height="wrap_content"
+      android:background="@drawable/list_bar"
+      android:padding="3dip">
     <Button android:id="@+id/waypointdetails_cancel"
+      android:layout_width="wrap_content"
+      android:layout_height="48dip"
       android:layout_gravity="right"
-      android:text="@string/generic_cancel"
-      style="@style/Button"/>
-    <LinearLayout style="@style/ButtonSpacer"/>
+      android:text="@string/cancel"
+      android:textSize="14dip"/>
+    <TextView
+      android:layout_width="0dip"
+      android:layout_height="wrap_content"
+      android:layout_weight="1"/>
+    <Button android:id="@+id/waypointdetails_save"
+      android:layout_width="wrap_content"
+      android:layout_height="48dip"
+      android:layout_gravity="right"
+      android:text="@string/save"
+      android:textSize="14dip"/>
   </LinearLayout>
+
 </LinearLayout>

MyTracks/res/layout/mytracks_waypoints_list.xml

@@ -32,7 +32,7 @@ limitations under the License.
       android:layout_height="wrap_content"
       android:textSize="16dip"
       android:textColor="#fff"
-      android:text="@string/marker_list_pick_one"
+      android:text="@string/waypointslist_pick_one"
       android:layout_weight="0"/>
   </LinearLayout>
 
@@ -40,16 +40,28 @@ limitations under the License.
     android:layout_width="fill_parent"
     android:layout_height="wrap_content"
     android:layout_weight="1"/>
-  <LinearLayout style="@style/ButtonLayout">
-    <LinearLayout style="@style/ButtonSpacer"/>
+  <LinearLayout
+    android:orientation="horizontal"
+    android:layout_width="fill_parent"
+    android:layout_height="wrap_content"
+    android:background="@drawable/list_bar"
+    android:layout_weight="0"
+    android:padding="3dip">
+    <TextView
+      android:layout_width="0dip"
+      android:layout_height="wrap_content"
+      android:layout_weight="1"/>
     <Button android:id="@+id/waypointslist_btn_insert_statistics"
-      android:layout_gravity="left"
-      android:text="@string/marker_list_insert_statistics"
-      style="@style/Button"/>
+      android:layout_width="wrap_content"
+      android:layout_height="48dip"
+      android:layout_gravity="left|top"
+      android:text="@string/waypointslist_btn_insert_statistics"
+      android:textSize="14dip"/>
     <Button android:id="@+id/waypointslist_btn_insert_waypoint"
-      android:layout_gravity="right"
-      android:text="@string/marker_list_insert_waypoint"
-      style="@style/Button"/>
-    <LinearLayout style="@style/ButtonSpacer"/>
-  </LinearLayout>
+      android:layout_width="wrap_content"
+      android:layout_height="48dip"
+      android:layout_gravity="left|top"
+      android:text="@string/waypointslist_btn_insert_waypoint"
+      android:textSize="14dip"/>
+   </LinearLayout>
 </LinearLayout>

MyTracks/res/layout/send_to_google_result.xml

@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-Copyright 2011 Google Inc.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
--->
-<!--
-This layout is used as the content view for the send-to-Google result dialog.
-It is used to summarize the results of uploading track data to one or more
-services.
--->
-<LinearLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="fill_parent"
-    android:layout_height="wrap_content"
-    android:paddingTop="5dip"
-    android:paddingBottom="5dip"
-    android:paddingLeft="14dip"
-    android:paddingRight="14dip"
-    android:orientation="vertical">
-  <TextView
-      android:layout_width="fill_parent"
-      android:layout_height="wrap_content"
-      android:text="@string/send_google_result_header"
-      style="?android:attr/textAppearanceLarge"/>
-  <TableLayout
-      android:layout_width="wrap_content"
-      android:layout_height="wrap_content"
-      android:gravity="center_horizontal">
-    <!-- We don't want a divider, so we set its color to transparent. -->
-    <!-- We do this explicitly, rather than with a color resource, because -->
-    <!-- an apparent bug causes the divider to be wildly misrendered on -->
-    <!-- a Mini X10 running 2.1. -->
-    <ListView
-        android:id="@+id/send_to_google_result_list"
-        android:clickable="false"
-        android:paddingTop="10dip"
-        android:paddingBottom="10dip"
-        android:divider="#00000000"/>
-  </TableLayout>
-  <TextView
-      android:id="@+id/send_to_google_result_comment"
-      android:layout_width="fill_parent"
-      android:layout_height="wrap_content"
-      android:text="@string/send_google_success_footer"
-      android:visibility="gone"
-      style="?android:attr/textAppearanceSmall"/>
-  <TextView
-      android:id="@+id/send_to_google_result_error"
-      android:layout_width="fill_parent"
-      android:layout_height="wrap_content"
-      android:text="@string/send_google_error"
-      android:visibility="gone"
-      style="?android:attr/textAppearanceLarge"/>
-</LinearLayout>

MyTracks/res/layout/send_to_google_result_list_item.xml

@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-Copyright 2011 Google Inc.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
--->
-<!--
-This layout represents the result of sending track data to a single service.
-It will be instantiated by a custom ListAdapter - once for each service to
-which track data was uploaded.
--->
-<TableRow
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content">
-  <ImageView
-      android:id="@+id/send_to_google_result_icon"
-      android:src="@drawable/success"
-      android:layout_width="wrap_content"
-      android:layout_height="fill_parent"
-      android:layout_gravity="top"/>
-  <LinearLayout
-      android:layout_width="wrap_content"
-      android:layout_height="wrap_content"
-      android:orientation="vertical">
-    <TextView
-        android:id="@+id/send_to_google_result_name"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="Google Docs"
-        style="?android:attr/textAppearanceMedium"/>
-    <TextView
-        android:id="@+id/send_to_google_result_url"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="http://google.com"
-        style="?android:attr/textAppearanceSmall"/>
-  </LinearLayout>
-</TableRow>

MyTracks/res/layout/sensor_state.xml

@@ -1,152 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-Copyright 2010 Google Inc.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
--->
-<RelativeLayout
-  xmlns:android="http://schemas.android.com/apk/res/android"
-  android:layout_height="wrap_content"
-  android:orientation="horizontal"
-  android:layout_width="fill_parent">
-
-  <ScrollView
-    android:layout_height="wrap_content"
-    android:layout_width="fill_parent">
-
-    <LinearLayout
-      android:layout_height="wrap_content"
-      android:layout_width="fill_parent">
-
-      <TableLayout
-        android:layout_height="wrap_content"
-        android:stretchColumns="1,4"
-        android:layout_width="fill_parent">
-
-        <!--  Layout the sensor state on one line.  -->
-        <TableRow>
-          <TextView
-            android:layout_span="5"
-            android:text="@string/menu_sensor_state" />
-        </TableRow>
-        <TableRow
-          android:background="@color/stat_label_background">
-          <TextView
-            android:id="@+id/sensor_state_register"
-            android:layout_column="1"
-            android:layout_span="5"
-            style="@style/StatsRegister" />
-        </TableRow>
-
-        <!--  Layout the sensor data age on one line. -->
-        <TableRow>
-          <TextView
-            android:layout_span="5"
-            android:text="@string/sensor_state_last_sensor_time" />
-        </TableRow>
-        <TableRow
-          android:background="@color/stat_label_background">
-          <TextView
-            android:id="@+id/sensor_data_time_register"
-            android:layout_column="1"
-            android:layout_span="5"
-            style="@style/StatsRegister" />
-        </TableRow>
-
-        <!-- Power meter -->
-        <TableRow
-          android:padding="1dip">
-          <TextView
-            android:layout_column="1"
-            android:layout_span="3"
-            android:text="@string/sensor_state_power" />
-        </TableRow>
-        <TableRow
-          android:background="@color/stat_label_background">
-          <TextView
-            style="@style/StatsRegister.Big"
-            android:id="@+id/power_state_register"
-            android:layout_column="1"
-            android:layout_span="4" />
-          <TextView
-            style="@style/StatsUnitSolo" />
-            android:layout_column="5"
-            android:text="@string/watts" />
-        </TableRow>
-        
-        <!-- Cadence -->
-        <TableRow
-          android:padding="1dip">
-          <TextView
-            android:layout_column="1"
-            android:layout_span="3"
-            android:text="@string/sensor_state_cadence" />
-        </TableRow>
-        <TableRow
-          android:background="@color/stat_label_background">
-          <TextView
-            style="@style/StatsRegister.Big"
-            android:id="@+id/cadence_state_register"
-            android:layout_column="4" />
-          <TextView
-            style="@style/StatsUnitSolo" />
-            android:layout_column="2"
-            android:text="@string/revolutions_per_minute" />
-        </TableRow>
-
-        <!-- Heart Rate -->
-        <TableRow
-          android:padding="1dip">
-          <TextView
-            android:layout_column="1"
-            android:layout_span="3"
-            android:text="@string/sensor_state_heart_rate" />
-        </TableRow>
-        <TableRow
-          android:background="@color/stat_label_background">
-          <TextView
-            style="@style/StatsRegister.Big"
-            android:id="@+id/heart_rate_register"
-            android:layout_column="1"
-            android:layout_span="4" />
-          <TextView
-            style="@style/StatsUnitSolo"
-            android:layout_column="5"
-            android:text="@string/unit_beat_per_minute" />
-        </TableRow>
-
-        <!-- Battery Level -->
-        <TableRow
-          android:padding="1dip">
-          <TextView
-            android:layout_column="1"
-            android:layout_span="3"
-            android:text="@string/sensor_state_battery" />
-        </TableRow>
-        <TableRow
-          android:background="@color/stat_label_background">
-          <TextView
-            style="@style/StatsRegister.Big"
-            android:id="@+id/battery_level_register"
-            android:layout_column="1"
-            android:layout_span="4" />
-          <TextView
-            style="@style/StatsUnitSolo"
-            android:layout_column="5"
-            android:text="@string/unit_percent" />
-        </TableRow>
-
-      </TableLayout>
-    </LinearLayout>
-  </ScrollView>
-</RelativeLayout>

MyTracks/res/layout/stats.xml

@@ -37,15 +37,20 @@ limitations under the License.
         <TextView
           android:id="@+id/speed_label"
           android:layout_span="5"
-          android:text="@string/stat_speed" />
+          android:text="@string/speed" />
       </TableRow>
       <TableRow
         android:background="@color/stat_label_background">
         <TextView
-          style="@style/StatsRegister.Big"
+          android:gravity="right"
           android:id="@+id/speed_register"
           android:layout_column="1"
-          android:layout_span="4"/>
+          android:layout_marginBottom="-13dip"
+          android:layout_marginTop="-13dip"
+          android:layout_span="4"
+          android:text="@string/unknown"
+          android:textColor="@color/stat_label_text"
+          android:textSize="50sp" />
         <LinearLayout
           android:gravity="bottom"
           android:layout_column="5"
@@ -57,12 +62,24 @@ limitations under the License.
             android:layout_width="fill_parent" />
           <TextView
             android:id="@+id/speed_unit_label_top"
-	          style="@style/StatsUnit" />
+            android:gravity="bottom"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="2dip"
+            android:layout_marginTop="2dip"
+            android:layout_width="wrap_content"
+            android:textColor="@color/stat_label_text" />
           <TextView
-	          style="@style/StatsDivider" />
+            android:background="@color/black"
+            android:layout_height="3dip"
+            android:layout_width="fill_parent" />
           <TextView
             android:id="@+id/speed_unit_label_bottom"
-	          style="@style/StatsUnit" />
+            android:gravity="bottom"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="2dip"
+            android:layout_marginTop="2dip"
+            android:layout_width="wrap_content"
+            android:textColor="@color/stat_label_text" />
         </LinearLayout>
       </TableRow>
 
@@ -73,35 +90,53 @@ limitations under the License.
           android:id="@+id/total_distance_label"
           android:layout_column="1"
           android:layout_span="3"
-          android:text="@string/stat_total_distance" />
+          android:text="@string/total_distance_label" />
         <TextView
           android:id="@+id/max_speed_label"
           android:layout_column="4"
           android:layout_span="2"
-          android:text="@string/stat_max_speed" />
+          android:text="@string/max_speed_label" />
       </TableRow>
       <TableRow
         android:background="@color/stat_label_background">
         <TextView
-          style="@style/StatsRegister"
+          android:gravity="right"
           android:id="@+id/total_distance_register"
-          android:layout_column="1" />
+          android:layout_column="1"
+          android:layout_marginBottom="-9dip"
+          android:layout_marginTop="-9dip"
+          android:text="@string/unknown"
+          android:textColor="@color/stat_label_text"
+          android:textSize="40sp" />
         <TextView
+          android:gravity="left"
           android:id="@+id/total_distance_unit_label"
           android:layout_column="2"
-	        style="@style/StatsUnitSolo" />
+          android:layout_marginBottom="-9dip"
+          android:layout_marginTop="-9dip"
+          android:text="@string/mile"
+          android:textColor="@color/stat_label_text" />
         <!-- TODO 4/08/2009
         The following is a bad hack to get a spacer the same size as the
         text.  Ideally this should just be a View, however I don't know how to
         set the view height properly.  fill_parent on this element causes as
         NullPointerException. This same filler is repeated on each line.-->
         <TextView
-          style="@style/StatsSpacer"
-          android:layout_column="3"/>
+          android:background="@color/black"
+          android:layout_column="3"
+          android:layout_marginBottom="-9dip"
+          android:layout_marginTop="-9dip"
+          android:layout_width="5dip"
+          android:textSize="40sp" />
         <TextView
+          android:gravity="right"
           android:id="@+id/max_speed_register"
-          style="@style/StatsRegister"
-          android:layout_column="4" />
+          android:layout_column="4"
+          android:layout_marginBottom="-9dip"
+          android:layout_marginTop="-9dip"
+          android:text="@string/unknown"
+          android:textColor="@color/stat_label_text"
+          android:textSize="40sp" />
         <LinearLayout
           android:gravity="bottom"
           android:layout_column="5"
@@ -110,12 +145,24 @@ limitations under the License.
           android:orientation="vertical">
           <TextView
             android:id="@+id/max_speed_unit_label_top"
-            style="@style/StatsUnit" />
+            android:gravity="bottom"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="-1dip"
+            android:layout_marginTop="-1dip"
+            android:layout_width="wrap_content"
+            android:textColor="@color/stat_label_text" />
           <TextView
-	          style="@style/StatsDivider" />
+            android:background="@color/black"
+            android:layout_height="3dip"
+            android:layout_width="fill_parent" />
           <TextView
             android:id="@+id/max_speed_unit_label_bottom"
-            style="@style/StatsUnit" />
+            android:gravity="bottom"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="-1dip"
+            android:layout_marginTop="-1dip"
+            android:layout_width="wrap_content"
+            android:textColor="@color/stat_label_text" />
         </LinearLayout>
       </TableRow>
 
@@ -125,29 +172,43 @@ limitations under the License.
           android:id="@+id/track_time_label"
           android:layout_column="1"
           android:layout_span="3"
-          android:text="@string/stat_total_time" />
+          android:text="@string/total_time_label" />
         <TextView
           android:id="@+id/average_speed_label"
           android:layout_column="4"
           android:layout_span="2"
-          android:text="@string/stat_average_speed" />
+          android:text="@string/average_speed_label" />
       </TableRow>
       <TableRow
         android:background="@color/stat_label_background">
         <TextView
+          android:gravity="right"
           android:id="@+id/total_time_register"
           android:layout_column="1"
           android:layout_height="wrap_content"
+          android:layout_marginBottom="-9dip"
+          android:layout_marginTop="-9dip"
           android:layout_span="2"
           android:layout_width="fill_parent"
-          style="@style/StatsRegister" />
+          android:text="@string/unknown"
+          android:textColor="@color/stat_label_text"
+          android:textSize="40sp" />
         <TextView
-          style="@style/StatsSpacer"
-          android:layout_column="3"/>
+          android:background="@color/black"
+          android:layout_column="3"
+          android:layout_marginBottom="-9dip"
+          android:layout_marginTop="-9dip"
+          android:layout_width="5dip"
+          android:textSize="40sp" />
         <TextView
+          android:gravity="right"
           android:id="@+id/average_speed_register"
           android:layout_column="4"
-          style="@style/StatsRegister" />
+          android:layout_marginBottom="-9dip"
+          android:layout_marginTop="-9dip"
+          android:text="@string/unknown"
+          android:textColor="@color/stat_label_text"
+          android:textSize="40sp" />
         <LinearLayout
           android:gravity="bottom"
           android:layout_column="5"
@@ -156,12 +217,24 @@ limitations under the License.
           android:orientation="vertical">
           <TextView
             android:id="@+id/average_speed_unit_label_top"
-            style="@style/StatsUnit" />
+            android:gravity="bottom"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="-1dip"
+            android:layout_marginTop="-1dip"
+            android:layout_width="wrap_content"
+            android:textColor="@color/stat_label_text" />
           <TextView
-	          style="@style/StatsDivider" />
+            android:background="@color/black"
+            android:layout_height="3dip"
+            android:layout_width="fill_parent" />
           <TextView
             android:id="@+id/average_speed_unit_label_bottom"
-            style="@style/StatsUnit" />
+            android:gravity="bottom"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="-1dip"
+            android:layout_marginTop="-1dip"
+            android:layout_width="wrap_content"
+            android:textColor="@color/stat_label_text" />
         </LinearLayout>
       </TableRow>
 
@@ -171,28 +244,43 @@ limitations under the License.
           android:id="@+id/moving_time_label"
           android:layout_column="1"
           android:layout_span="3"
-          android:text="@string/stat_moving_time" />
+          android:text="@string/moving_time_label" />
         <TextView
           android:id="@+id/average_moving_speed_label"
           android:layout_column="4"
           android:layout_span="2"
-          android:text="@string/stat_average_moving_speed" />
+          android:text="@string/average_moving_speed_label" />
       </TableRow>
       <TableRow
         android:background="@color/stat_label_background">
         <TextView
+          android:gravity="right"
           android:id="@+id/moving_time_register"
           android:layout_column="1"
           android:layout_height="wrap_content"
+          android:layout_marginBottom="-9dip"
+          android:layout_marginTop="-9dip"
           android:layout_span="2"
           android:layout_width="fill_parent"
-          style="@style/StatsRegister" />
+          android:text="@string/unknown"
+          android:textColor="@color/stat_label_text"
+          android:textSize="40sp" />
         <TextView
-          style="@style/StatsSpacer"
-          android:layout_column="3"/>
+          android:background="@color/black"
+          android:layout_column="3"
+          android:layout_marginBottom="-9dip"
+          android:layout_marginTop="-9dip"
+          android:layout_width="5dip"
+          android:textSize="40sp" />
         <TextView
+          android:gravity="right"
           android:id="@+id/average_moving_speed_register"
-          style="@style/StatsRegister" />
+          android:layout_column="4"
+          android:layout_marginBottom="-9dip"
+          android:layout_marginTop="-9dip"
+          android:text="@string/unknown"
+          android:textColor="@color/stat_label_text"
+          android:textSize="40sp" />
         <LinearLayout
           android:gravity="bottom"
           android:layout_column="5"
@@ -201,14 +289,24 @@ limitations under the License.
           android:orientation="vertical">
           <TextView
             android:id="@+id/average_moving_speed_unit_label_top"
-            style="@style/StatsUnit" />
+            android:gravity="bottom"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="-1dip"
+            android:layout_marginTop="-1dip"
+            android:layout_width="wrap_content"
+            android:textColor="@color/stat_label_text" />
           <TextView
-	          style="@style/StatsDivider" />
+            android:background="@color/black"
             android:layout_height="3dip"
             android:layout_width="fill_parent" />
           <TextView
             android:id="@+id/average_moving_speed_unit_label_bottom"
-            style="@style/StatsUnit" />
+            android:gravity="bottom"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="-1dip"
+            android:layout_marginTop="-1dip"
+            android:layout_width="wrap_content"
+            android:textColor="@color/stat_label_text" />
         </LinearLayout>
       </TableRow>
 
@@ -218,34 +316,56 @@ limitations under the License.
           android:id="@+id/elevation_label"
           android:layout_column="1"
           android:layout_span="3"
-          android:text="@string/stat_elevation" />
+          android:text="@string/elevation_label" />
         <TextView
           android:id="@+id/elevation_gain_label"
           android:layout_column="4"
           android:layout_span="2"
-          android:text="@string/stat_elevation_gain" />
+          android:text="@string/elevation_gain_label" />
       </TableRow>
       <TableRow
         android:background="@color/stat_label_background">
         <TextView
+          android:gravity="right"
           android:id="@+id/elevation_register"
           android:layout_column="1"
-          style="@style/StatsRegister" />
+          android:layout_marginBottom="-9dip"
+          android:layout_marginTop="-9dip"
+          android:text="@string/unknown"
+          android:textColor="@color/stat_label_text"
+          android:textSize="40sp" />
         <TextView
+          android:gravity="left"
           android:id="@+id/elevation_unit_label"
           android:layout_column="2"
-          style="@style/StatsUnitSolo" />
+          android:layout_marginBottom="-9dip"
+          android:layout_marginTop="-9dip"
+          android:text="@string/feet"
+          android:textColor="@color/stat_label_text"/>
         <TextView
-          style="@style/StatsSpacer"
-          android:layout_column="3"/>
+          android:background="@color/black"
+          android:layout_column="3"
+          android:layout_marginBottom="-9dip"
+          android:layout_marginTop="-9dip"
+          android:layout_width="5dip"
+          android:textSize="40sp" />
         <TextView
+          android:gravity="right"
           android:id="@+id/elevation_gain_register"
           android:layout_column="4"
-          style="@style/StatsRegister" />
+          android:layout_marginBottom="-9dip"
+          android:layout_marginTop="-9dip"
+          android:text="@string/unknown"
+          android:textColor="@color/stat_label_text"
+          android:textSize="40sp" />
         <TextView
+          android:gravity="right"
           android:id="@+id/elevation_gain_unit_label"
           android:layout_column="5"
-          style="@style/StatsUnitSolo" />
+          android:layout_marginBottom="-9dip"
+          android:layout_marginTop="-9dip"
+          android:text="@string/feet"
+          android:textColor="@color/stat_label_text" />
       </TableRow>
 
       <!-- Min and max elevation -->
@@ -254,34 +374,56 @@ limitations under the License.
           android:id="@+id/min_elevation_label"
           android:layout_column="1"
           android:layout_span="3"
-          android:text="@string/stat_min_elevation" />
+          android:text="@string/min_elevation_label" />
         <TextView
           android:id="@+id/max_elevation_label"
           android:layout_column="4"
           android:layout_span="3"
-          android:text="@string/stat_max_elevation" />
+          android:text="@string/max_elevation_label" />
       </TableRow>
       <TableRow
         android:background="@color/stat_label_background">
         <TextView
+          android:gravity="right"
           android:id="@+id/min_elevation_register"
           android:layout_column="1"
-          style="@style/StatsRegister" />
+          android:layout_marginBottom="-9dip"
+          android:layout_marginTop="-9dip"
+          android:text="@string/unknown"
+          android:textColor="@color/stat_label_text"
+          android:textSize="40sp" />
         <TextView
+          android:gravity="left"
           android:id="@+id/min_elevation_unit_label"
           android:layout_column="2"
-          style="@style/StatsUnitSolo" />
+          android:layout_marginBottom="-9dip"
+          android:layout_marginTop="-9dip"
+          android:text="@string/feet"
+          android:textColor="@color/stat_label_text" />
         <TextView
-          style="@style/StatsSpacer"
-          android:layout_column="3"/>
+          android:background="@color/black"
+          android:layout_column="3"
+          android:layout_marginBottom="-9dip"
+          android:layout_marginTop="-9dip"
+          android:layout_width="5dip"
+          android:textSize="40sp" />
         <TextView
+          android:gravity="right"
           android:id="@+id/max_elevation_register"
           android:layout_column="4"
-          style="@style/StatsRegister" />
+          android:layout_marginBottom="-9dip"
+          android:layout_marginTop="-9dip"
+          android:text="@string/unknown"
+          android:textColor="@color/stat_label_text"
+          android:textSize="40sp" />
         <TextView
+          android:gravity="right"
           android:id="@+id/max_elevation_unit_label"
           android:layout_column="5"
-          style="@style/StatsUnitSolo" />
+          android:layout_marginBottom="-9dip"
+          android:layout_marginTop="-9dip"
+          android:text="@string/feet"
+          android:textColor="@color/stat_label_text" />
       </TableRow>
 
       <!-- Min and max grade -->
@@ -290,28 +432,46 @@ limitations under the License.
           android:id="@+id/min_grade_label"
           android:layout_column="1"
           android:layout_span="3"
-          android:text="@string/stat_min_grade" />
+          android:text="@string/min_grade_label" />
         <TextView
           android:id="@+id/max_grade_label"
           android:layout_column="4"
           android:layout_span="2"
-          android:text="@string/stat_max_grade" />
+          android:text="@string/max_grade_label" />
       </TableRow>
       <TableRow
         android:background="@color/stat_label_background">
         <TextView
+          android:gravity="right"
           android:id="@+id/min_grade_register"
           android:layout_column="1"
+          android:layout_height="wrap_content"
+          android:layout_marginBottom="-9dip"
+          android:layout_marginTop="-9dip"
+          android:layout_width="fill_parent"
           android:layout_span="2"
-          style="@style/StatsRegister" />
+          android:text="@string/unknown"
+          android:textColor="@color/stat_label_text"
+          android:textSize="40sp" />
         <TextView
-          style="@style/StatsSpacer"
-          android:layout_column="3"/>
+          android:background="@color/black"
+          android:layout_column="3"
+          android:layout_marginBottom="-9dip"
+          android:layout_marginTop="-9dip"
+          android:layout_width="5dip"
+          android:textSize="40sp" />
         <TextView
+          android:gravity="right"
           android:id="@+id/max_grade_register"
           android:layout_column="4"
+          android:layout_height="wrap_content"
+          android:layout_marginBottom="-9dip"
+          android:layout_marginTop="-9dip"
+          android:layout_width="fill_parent"
           android:layout_span="2"
-          style="@style/StatsRegister" />
+          android:text="@string/unknown"
+          android:textColor="@color/stat_label_text"
+          android:textSize="40sp" />
       </TableRow>
 
       <!-- Latitude and Longitude -->
@@ -319,28 +479,45 @@ limitations under the License.
         <TextView
           android:layout_column="1"
           android:layout_span="3"
-          android:text="@string/stat_latitude" />
+          android:text="@string/latitude_label" />
         <TextView
           android:layout_column="4"
           android:layout_span="2"
-          android:text="@string/stat_longitude" />
+          android:text="@string/longitude_label" />
       </TableRow>
       <TableRow
         android:background="@color/stat_label_background">
         <TextView
+          android:gravity="right"
           android:id="@+id/latitude_register"
           android:layout_column="1"
+          android:layout_height="wrap_content"
+          android:layout_marginBottom="-5dip"
+          android:layout_marginTop="-5dip"
+          android:layout_width="fill_parent"
           android:layout_span="2"
-          style="@style/StatsRegister.Small" />
-        <TextView
-          style="@style/StatsSpacer"
-          android:layout_column="3"
+          android:text="@string/unknown"
+          android:textColor="@color/stat_label_text"
           android:textSize="25sp" />
         <TextView
+          android:background="@color/black"
+          android:layout_column="3"
+          android:layout_marginBottom="-9dip"
+          android:layout_marginTop="-9dip"
+          android:layout_width="5dip"
+          android:textSize="25sp" />
+        <TextView
+          android:gravity="right"
           android:id="@+id/longitude_register"
           android:layout_column="4"
+          android:layout_height="wrap_content"
+          android:layout_marginBottom="-5dip"
+          android:layout_marginTop="-5dip"
+          android:layout_width="fill_parent"
           android:layout_span="2"
-          style="@style/StatsRegister.Small" />
+          android:text="@string/unknown"
+          android:textColor="@color/stat_label_text"
+          android:textSize="25sp" />
       </TableRow>
 
     </TableLayout>

MyTracks/res/layout/track_widget.xml

@@ -1,90 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-Copyright 2011 Google Inc.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
--->
-
-<LinearLayout
-  xmlns:android="http://schemas.android.com/apk/res/android"
-  android:layout_width="fill_parent"
-  android:layout_height="fill_parent"
-  android:paddingLeft="10px"
-  android:paddingRight="10px"
-  android:paddingTop="5px"
-  android:paddingBottom="5px">
-  <LinearLayout
-    android:layout_height="fill_parent"
-    android:layout_width="fill_parent"
-    android:background="@drawable/appwidget_background">
-    <ImageButton
-      android:id="@+id/appwidget_button"
-      android:layout_height="fill_parent"
-      android:layout_width="wrap_content"
-      android:background="@android:color/transparent"
-      android:paddingLeft="10px"
-      android:paddingRight="10px"
-      android:src="@drawable/appwidget_button_disabled" />
-    <LinearLayout
-      android:id="@+id/appwidget_track_statistics"
-      android:layout_height="fill_parent"
-      android:layout_width="fill_parent"
-      android:layout_weight="1"
-      android:clickable="true"
-      android:orientation="vertical"
-      android:paddingLeft="15px">
-      <LinearLayout
-        android:layout_height="wrap_content"
-        android:layout_width="fill_parent"
-        android:orientation="horizontal">
-        <TextView
-          style="@style/WidgetText.Register"
-          android:id="@+id/appwidget_distance_text" />
-        <TextView
-          style="@style/WidgetText"
-          android:text="@string/stat_total_distance" />
-      </LinearLayout>
-      <ImageView
-        android:layout_width="fill_parent"
-        android:layout_height="1px"
-        android:background="@color/appwidget_hr" />
-      <LinearLayout
-        android:layout_height="wrap_content"
-        android:layout_width="fill_parent"
-        android:orientation="horizontal"
-        android:paddingBottom="2px">
-        <TextView
-          style="@style/WidgetText.Register"
-          android:id="@+id/appwidget_time_text" />
-        <TextView
-          style="@style/WidgetText"
-          android:text="@string/stat_moving_time" />
-      </LinearLayout>
-      <ImageView
-        android:layout_width="fill_parent"
-        android:layout_height="1px"
-        android:background="@color/appwidget_hr" />
-      <LinearLayout
-        android:layout_height="wrap_content"
-        android:layout_width="fill_parent"
-        android:orientation="horizontal">
-        <TextView
-          style="@style/WidgetText.Register"
-          android:id="@+id/appwidget_speed_text" />
-        <TextView
-          style="@style/WidgetText"
-          android:text="@string/stat_speed" />
-      </LinearLayout>
-    </LinearLayout>
-  </LinearLayout>
-</LinearLayout>

MyTracks/res/layout/welcome.xml

@@ -24,16 +24,30 @@ limitations under the License.
     android:layout_width="fill_parent"
     android:layout_height="fill_parent"
     android:layout_weight="1" />
-  <LinearLayout style="@style/ButtonLayout">
-    <LinearLayout style="@style/ButtonSpacer"/>
-    <Button android:id="@+id/welcome_ok"
+  <LinearLayout
+    android:orientation="horizontal"
+    android:layout_width="fill_parent"
+    android:layout_height="wrap_content"
+    android:layout_weight="0"
+    android:background="@drawable/list_bar"
+    android:padding="3dip">
+    <Button
+      android:id="@+id/welcome_about"
+      android:layout_width="wrap_content"
+      android:layout_height="48dip"
       android:layout_gravity="left"
-      android:text="@string/generic_ok"
-      style="@style/Button"/>
-    <Button android:id="@+id/welcome_about"
-      android:layout_gravity="right"
       android:text="@string/welcome_about"
-      style="@style/Button"/>
-    <LinearLayout style="@style/ButtonSpacer"/>
+      android:textSize="14dip" />
+    <TextView
+      android:layout_width="0dip"
+      android:layout_height="wrap_content"
+      android:layout_weight="1" />
+    <Button
+      android:id="@+id/welcome_read_later"
+      android:layout_width="wrap_content"
+      android:layout_height="48dip"
+      android:layout_gravity="right"
+      android:text="@string/welcome_read_later"
+      android:textSize="14dip" />
   </LinearLayout>
 </LinearLayout>

MyTracks/res/menu/main.xml

@@ -1,37 +1,29 @@
 <?xml version="1.0" encoding="utf-8"?>
 <menu xmlns:android="http://schemas.android.com/apk/res/android">
-  <item android:id="@+id/menu_record_track"
-    android:icon="@drawable/ic_menu_recordtrack"
-    android:title="@string/menu_record_track"/>
+  <item android:id="@+id/menu_start_recording"
+    android:icon="@drawable/menu_record"
+    android:title="@string/start_recording"/>
 
   <item android:id="@+id/menu_stop_recording"
-    android:icon="@drawable/ic_menu_stoprecording"
-    android:title="@string/menu_stop_recording"/>
+    android:icon="@drawable/menu_stop"
+    android:title="@string/stop_recording"/>
 
-  <item android:id="@+id/menu_tracks"
-    android:icon="@drawable/ic_menu_tracklist"
-    android:title="@string/menu_tracks"/>
+  <item android:id="@+id/menu_list_tracks"
+    android:icon="@drawable/menu_list_tracks"
+    android:title="@string/list_tracks"/>
 
-  <item android:id="@+id/menu_markers"
-    android:icon="@drawable/ic_menu_waypoints"
-    android:title="@string/menu_markers"/>
+  <item android:id="@+id/menu_list_markers"
+    android:icon="@drawable/menu_marker"
+    android:title="@string/list_markers"/>
 
-  <item android:id="@+id/menu_sensor_state"
-    android:icon="@drawable/ic_menu_sensorstatus"
-    android:orderInCategory="1000"
-    android:title="@string/menu_sensor_state"/>
-  
   <item android:id="@+id/menu_settings"
     android:icon="@android:drawable/ic_menu_preferences"
     android:orderInCategory="1001"
-    android:title="@string/menu_settings"/>
-    
-  <item android:id="@+id/menu_aggregated_statistics"
-    android:orderInCategory="1002"
-    android:title="@string/menu_aggregated_statistics"/>
-    
+    android:title="@string/settings"/>
+
   <item android:id="@+id/menu_help"
     android:icon="@android:drawable/ic_menu_info_details"
-    android:orderInCategory="1003"
-    android:title="@string/menu_help"/>
+    android:orderInCategory="1002"
+    android:title="@string/help"/>
+
 </menu>

MyTracks/res/values-ca/strings.xml

@@ -1,216 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-Copyright 2010 Google Inc.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
--->
-<resources>
-  <string name="about_support">Assistència:</string>
-  <string name="about_team">Equip:</string>
-  <string name="about_version">Versió:</string>
-  <string name="chart_settings_by_distance">Per distància</string>
-  <string name="chart_settings_by_time">Per temps</string>
-  <string name="chart_settings_x_axis">Eix X</string>
-  <string name="chart_settings_y_axis">Eix Y</string>
-  <string name="eula_accept">Accepta</string>
-  <string name="eula_decline">Rebutja</string>
-  <string name="eula_title">Acord de llicencia d\'usuari final</string>
-  <string name="export_progress_message">S\'està escrivint a la targeta SD. Això pot trigar una estona.</string>
-  <string name="export_success">Exporta les finalitzades</string>
-  <string name="generic_cancel">Cancel·la</string>
-  <string name="generic_confirm_title">Esteu segur?</string>
-  <string name="generic_error_title">Error</string>
-  <string name="generic_no">No</string>
-  <string name="generic_ok">D\'acord</string>
-  <string name="generic_progress_title">Espereu...</string>
-  <string name="generic_save">Desa</string>
-  <string name="generic_success_title">Fet</string>
-  <string name="generic_yes">Sí</string>
-  <string name="gps_need_to_enable">Toqueu aquí per anar als paràmetres de seguretat i ubicació i activeu \'habilita els satèl·lits GPS\'. Premeu el botó d\'anar enrere per tornar.</string>
-  <string name="gps_not_found">No s\'ha trobat cap proveïdor d\'ubicació GPS en aquest dispositiu.</string>
-  <string name="gps_wait_for_fix">S\'està esperant per tenir una posició GPS fixa. Assegureu-vos que el cel és visible.</string>
-  <string name="marker_detail_marker_description">Descripció del marcador</string>
-  <string name="marker_detail_marker_name">Nom del marcador</string>
-  <string name="marker_detail_marker_type">Tipus de marcador (e.g. edifici, sot, vista...)</string>
-  <string name="marker_detail_marker_type_hint">Tipus de marcador</string>
-  <string name="marker_detail_title">Detalls del marcador</string>
-  <string name="marker_insert_error">No es pot inserir un marcador. No hi ha cap ubicació fixa disponible.</string>
-  <string name="marker_insert_success">S\'ha inserit un marcador d\'estadístiques.</string>
-  <string name="marker_label_end">(Fi)</string>
-  <string name="marker_label_start">(Inici)</string>
-  <string name="marker_list_context_menu_title">Aquest marcador</string>
-  <string name="marker_list_delete_marker">Elimina</string>
-  <string name="marker_list_delete_marker_confirm_message">El marcador s\'eliminarà de forma permanent d\'aquest telèfon.</string>
-  <string name="marker_list_edit_marker">Edita els detalls</string>
-  <string name="marker_list_insert_statistics">Insereix estadístiques</string>
-  <string name="marker_list_insert_waypoint">Insereix un punt de referència</string>
-  <string name="marker_list_pick_one">Seleccioneu un marcador. Mantingueu el dit per veure més opcions.</string>
-  <string name="marker_list_show_on_map">Mostra al mapa</string>
-  <string name="marker_type_statistics">Estadístiques</string>
-  <string name="marker_type_waypoint">Punt de referència</string>
-  <string name="menu_aggregated_statistics">Estadístiques agregades</string>
-  <string name="menu_chart_view_chart_settings">Configuració del gràfic</string>
-  <string name="menu_help">Ajuda</string>
-  <string name="menu_map_view_map_mode">Mode de mapa</string>
-  <string name="menu_map_view_my_location">La meva ubicació</string>
-  <string name="menu_map_view_satellite_mode">Mode de satèl·lit</string>
-  <string name="menu_markers">Marcadors</string>
-  <string name="menu_record_track">Enregistra la ruta</string>
-  <string name="menu_sensor_state">Estat del sensor</string>
-  <string name="menu_settings">Paràmetres</string>
-  <string name="menu_stop_recording">Atura l\'enregistrament</string>
-  <string name="menu_tracks">Rutes</string>
-  <string name="my_location_approximate_location">Nota: Es mostra una ubicació determinada a partir de les xarxes sense fils i antenes telefòniques.</string>
-  <string name="my_location_no_location">No es pot determinar la ubicació. Habiliteu més fonts d\'ubicació (vegeu els paràmetres de seguretat i ubicació) i assegureu-vos que el cel és visible. Proveu de nou més tard.</string>
-  <string name="my_maps_list_no_maps">Encara no teniu cap mapa.</string>
-  <string name="my_maps_list_public_label">Públic</string>
-  <string name="my_maps_list_unlisted_label">No llistat</string>
-  <string name="sd_card_error_create_dir">No es pot crear el directori a la targeta SD.</string>
-  <string name="sd_card_error_no_storage">No s\'ha trobat cap dispositiu d\'emmagatzematge extern. Assegureu-vos que la targeta SD està inserida i que el telèfon no està connectat a un ordinador.</string>
-  <string name="sd_card_error_read_file">No es pot llegir des del fitxer.</string>
-  <string name="sd_card_error_write_file">No es pot escriure a un fitxer.</string>
-  <string name="sd_card_success_read_file">S\'ha finalitzat la lectura a la targeta SD.</string>
-  <string name="sd_card_success_write_file">S\'ha finalitzat l\'escriptura a la targeta SD.</string>
-  <string name="send_google_choose_account_title">Trieu un compte</string>
-  <string name="send_google_error">S\'ha produït un error. Proveu de nou.</string>
-  <string name="send_google_no_account_message">No s\'ha trobat cap compte on pujar les rutes.</string>
-  <string name="send_google_no_account_title">No s\'ha trobat cap compte</string>
-  <string name="send_google_progress_preparing_track">S\'està preparant la ruta...</string>
-  <string name="send_google_progress_reading_track">S\'està llegint la ruta...</string>
-  <string name="send_google_recorded">Enregistrat</string>
-  <string name="send_google_result_share_url">Comparteix la ruta amb amics</string>
-  <string name="send_google_send_now">Envia ara</string>
-  <string name="send_google_title">Envia a...</string>
-  <string name="send_google_track_part_label">(Part %d)</string>
-  <string name="sensor_state_cadence">Cadència</string>
-  <string name="sensor_state_connected">S\'ha connectat</string>
-  <string name="sensor_state_connecting">S\'està connectant</string>
-  <string name="sensor_state_disconnected">S\'ha desconnectat</string>
-  <string name="sensor_state_heart_rate">Freqüència cardíaca</string>
-  <string name="sensor_state_last_sensor_time">Dades del sensor de temps</string>
-  <string name="sensor_state_power">Energia</string>
-  <string name="sensor_state_sending">S\'està enviant</string>
-  <string name="settings_backup">Còpia de seguretat (BETA)</string>
-  <string name="settings_backup_now">Fes la còpia ara</string>
-  <string name="settings_backup_now_progress_message">S\'estan escrivint totes les rutes i els paràmetres a la targeta SD. Això pot trigar una estona...</string>
-  <string name="settings_backup_now_summary">Escriu una còpia completa de totes les rutes i els paràmetres a la targeta SD</string>
-  <string name="settings_backup_restore">Restaura ara</string>
-  <string name="settings_backup_restore_confirm_message">La restauració d\'una còpia de seguretat des de la targeta SD sobreescriurà totes les rutes i paràmetres. Esteu segur?</string>
-  <string name="settings_backup_restore_no_backup">No s\'ha trobat cap còpia de seguretat.</string>
-  <string name="settings_backup_restore_progress_message">S\'estan llegint totes les rutes i els paràmetres de la targeta SD. Això pot trigar una estona...</string>
-  <string name="settings_backup_restore_select_title">Seleccioneu la còpia que es restaurarà</string>
-  <string name="settings_backup_restore_summary">Restaura totes les rutes i els paràmetres des de la targeta SD.</string>
-  <string name="settings_backup_sd_card">Còpia de seguretat a la targeta SD</string>
-  <string name="settings_display">Visualització</string>
-  <string name="settings_display_metric">Fes servir unitats mètriques</string>
-  <string name="settings_display_metric_summary_off">Totes les distàncies es mostraran en unitats imperials</string>
-  <string name="settings_display_metric_summary_on">Totes les distàncies es mostraran en unitats mètriques</string>
-  <string name="settings_display_speed">Mostra la velocitat</string>
-  <string name="settings_display_speed_summary_off">Es mostrarà el ritme de pas</string>
-  <string name="settings_display_speed_summary_on">Es mostrarà la velocitat</string>
-  <string name="settings_recording">Enregistrament</string>
-  <string name="settings_recording_auto_resume">Temps d\'espera per reprende la ruta</string>
-  <string name="settings_recording_auto_resume_summary">Temps màxim en minuts a partir del qual l\'anterior ruta enregistrada no es reprendrà en actualitzar el telèfon</string>
-  <string name="settings_recording_distance">Distància mínima entre punts</string>
-  <string name="settings_recording_distance_summary">La distància més petita entre dos punts enregistrats de la vostra posició</string>
-  <string name="settings_recording_gps_accuracy">Precisió mínima</string>
-  <string name="settings_recording_gps_accuracy_summary">S\'aturarà l\'enregistrament si la vostra posició no és així de precisa com a mínim</string>
-  <string name="settings_recording_interval">Temps mínim entre punts</string>
-  <string name="settings_recording_interval_summary">Interval de temps mínim entre dos enregistraments de la vostra posició</string>
-  <string name="settings_recording_marker">Freqüència de divisió</string>
-  <string name="settings_recording_marker_summary">Temps o distància màxima a partir de la qual s\'insertarà un marcador de divisió nou</string>
-  <string name="settings_recording_name">Data i hora com a nom de la ruta</string>
-  <string name="settings_recording_name_summary_off">Els noms de les rutes seran números que s\'incrementaran per a cada nova ruta.</string>
-  <string name="settings_recording_name_summary_on">El nom per defecte de la ruta serà la data i hora en que s\'ha iniciat.</string>
-  <string name="settings_recording_track_distance">Distància màxima entre punts</string>
-  <string name="settings_recording_track_distance_summary">Si dos punts estan més lluny d\'això, es dividirà la ruta</string>
-  <string name="settings_recording_voice">Freqüència d\'avís</string>
-  <string name="settings_recording_voice_not_available">No es troba disponible a la vostra versió de l\'Android</string>
-  <string name="settings_recording_voice_summary">Temps mínim entre dos avisos de veu</string>
-  <string name="settings_sensor">Opcions del sensor</string>
-  <string name="settings_sensor_bluetooth_options">Opcions del Bluetooth</string>
-  <string name="settings_sensor_bluetooth_pairing">Associació de dispositius</string>
-  <string name="settings_sensor_bluetooth_pairing_summary">Obriu els paràmetres de bluetooth de l\'Android per associar un dispositiu</string>
-  <string name="settings_sensor_bluetooth_sensor">Sensor bluetooth</string>
-  <string name="settings_sensor_bluetooth_sensor_summary">El sensor bluetooth al qual es connecta.</string>
-  <string name="settings_sensor_type">Tipus de sensor</string>
-  <string name="settings_sensor_type_none">Cap</string>
-  <string name="settings_sensor_type_summary">El tipus de sensor al qual es connecta.</string>
-  <string name="settings_sharing">Compartició</string>
-  <string name="settings_sharing_map_public">Fes el mapa públic</string>
-  <string name="settings_sharing_map_public_summary_off">Els mapes pujats no es llistaran públicament a maps.google.com</string>
-  <string name="settings_sharing_map_public_summary_on">Els mapes pujats seran visibles per tothom a maps.google.com</string>
-  <string name="settings_sharing_url_only">Comparteix només l\'URL</string>
-  <string name="settings_sharing_url_only_summary_off">També s\'inclouran els continguts de la ruta quan es comparteixi</string>
-  <string name="settings_title">Paràmetres de My Tracks</string>
-  <string name="share_track_file_body_format">Em sembla que estaràs interessat en aquesta ruta.\n\nPer veure aquesta ruta fes servir Google Earth o altre programari de mapes.</string>
-  <string name="share_track_subject">M\'agradaria compartir una ruta amb tu</string>
-  <string name="share_track_url_body_format">Em sembla que estaràs interessat en aquest mapa:\n\n%s</string>
-  <string name="stat_average_moving_pace">Ritme mitjà en moviment</string>
-  <string name="stat_average_moving_speed">Velocitat mitjana en moviment</string>
-  <string name="stat_average_pace">Ritme de pas mitjà</string>
-  <string name="stat_average_speed">Velocitat mitjana</string>
-  <string name="stat_elevation">Elevació</string>
-  <string name="stat_elevation_gain">Guany d\'elevació</string>
-  <string name="stat_latitude">Latitud</string>
-  <string name="stat_longitude">Longitud</string>
-  <string name="stat_max_elevation">Elevació màxima</string>
-  <string name="stat_max_grade">Grau màxim</string>
-  <string name="stat_max_speed">Velocitat màxima</string>
-  <string name="stat_min_elevation">Elevació mínima</string>
-  <string name="stat_min_grade">Grau mínim</string>
-  <string name="stat_min_pace">Ritme de pas mínima</string>
-  <string name="stat_moving_time">Temps en moviment</string>
-  <string name="stat_pace">Ritme de pas</string>
-  <string name="stat_speed">Velocitat</string>
-  <string name="stat_total_distance">Distància total</string>
-  <string name="stat_total_time">Temps total</string>
-  <string name="track_detail_activity_type">Tipus d\'activitat (p.e. senderisme, bicicleta, còrrer, escalada...)</string>
-  <string name="track_detail_activity_type_hint">Tipus d\'activitat</string>
-  <string name="track_detail_title">Detalls de la ruta</string>
-  <string name="track_detail_track_description">Descripció de la ruta</string>
-  <string name="track_detail_track_name">Nom de la ruta</string>
-  <string name="track_list_clear_map">Neteja el mapa</string>
-  <string name="track_list_context_menu_title">Aquesta ruta</string>
-  <string name="track_list_delete_all">Elimina totes les rutes</string>
-  <string name="track_list_delete_all_confirm_message">Tots els marcadors i rutes s\'eliminaran d\'aquest telèfon.</string>
-  <string name="track_list_delete_track">Elimina del telèfon...</string>
-  <string name="track_list_delete_track_confirm_message">La ruta i els seus marcadors s\'eliminaran de forma permanent d\'aquest telèfon.</string>
-  <string name="track_list_edit_track">Edita els detalls</string>
-  <string name="track_list_export_all">Exporta totes les rutes</string>
-  <string name="track_list_pick_one">Seleccioneu una ruta. Mantingueu el dit per veure més opcions.</string>
-  <string name="track_list_save_sd">Escriu a la targeta SD...</string>
-  <string name="track_list_send_google">Envia a Google...</string>
-  <string name="track_list_share_track">Comparteix amb amics...</string>
-  <string name="track_list_show_on_map">Mostra</string>
-  <string name="track_name_format">Ruta %d</string>
-  <string name="track_record_error">No es pot iniciar l\'enregistrament. Proveu de nou.</string>
-  <string name="track_record_notification">S\'està enregistrant la ruta...</string>
-  <string name="track_record_success">Ara s\'està enregistrant una ruta nova.</string>
-  <string name="voice_hour">hora</string>
-  <string name="voice_hours">hores</string>
-  <string name="voice_kilometer_per_hour">kilòmetres per hora</string>
-  <string name="voice_kilometers">kilòmetres</string>
-  <string name="voice_mile_per_hour">milles per hora</string>
-  <string name="voice_miles">milles</string>
-  <string name="voice_minute">minut</string>
-  <string name="voice_minutes">minuts</string>
-  <string name="voice_no_distance">Sense distància My Tracks</string>
-  <string name="voice_per_kilometer">per kilòmetre</string>
-  <string name="voice_per_mile">per milla</string>
-  <string name="voice_second">segon</string>
-  <string name="voice_seconds">segons</string>
-  <string name="voice_template">My Tracks %1$.2f %2$s en %3$s at %4$s %5$s</string>
-  <string name="welcome_about">Quant a My Tracks</string>
-  <string name="welcome_title">Benvingut</string>
-</resources>

MyTracks/res/values-de/arrays.xml

@@ -0,0 +1,284 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+Copyright 2010 Google Inc.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+<resources>
+  <!-- Task frequency -->
+  <string-array name="task_frequency_options">
+    <item>Off</item>
+    <item>1 min</item>
+    <item>2 min</item>
+    <item>5 min</item>
+    <item>10 min</item>
+    <item>15 min</item>
+    <item>30 min</item>
+    <item>60 min</item>
+  </string-array>
+
+  <!-- Minimum recording distance -->
+  <string-array name="min_recording_distance_options">
+    <item>1 m</item>
+    <item>2 m</item>
+    <item>3 m</item>
+    <item>4 m</item>
+    <item>5 m (empfohlen)</item>
+    <item>10 m</item>
+    <item>100 m</item>
+  </string-array>
+
+  <string-array name="min_recording_distance_options_ft">
+    <item>3 Fuß</item>
+    <item>6 Fuß</item>
+    <item>10 Fuß</item>
+    <item>13 Fuß</item>
+    <item>16 Fuß (empfohlen)</item>
+    <item>33 Fuß</item>
+    <item>328 Fuß</item>
+  </string-array>
+
+
+  <!-- Maximum recording distance -->
+  <string-array name="max_recording_distance_options">
+    <item>50 m</item>
+    <item>100 m</item>
+    <item>200 m (empfohlen)</item>
+    <item>500 m</item>
+    <item>1000 m</item>
+    <item>5000 m</item>
+  </string-array>
+
+  <string-array name="max_recording_distance_options_ft">
+    <item>164 Fuß</item>
+    <item>328 Fuß</item>
+    <item>656 Fuß (empfohlen)</item>
+    <item>1640 Fuß</item>
+    <item>0,6 Meilen</item>
+    <item>3,1 Meilen</item>
+  </string-array>
+
+  <!-- Minimum recording interval -->
+  <string-array name="min_recording_interval_options">
+    <item>batterie sparend (adaptiv)</item>
+    <item>hohe genauigkeit (adaptiv)</item>
+    <item>maximal (empfohlen)</item>
+    <item>2 s</item>
+    <item>3 s</item>
+    <item>4 s</item>
+    <item>5 s</item>
+    <item>10 s</item>
+    <item>20 s</item>
+    <item>30 s</item>
+    <item>1 min</item>
+    <item>2 min</item>
+    <item>5 min</item>
+    <item>10 min</item>
+    <item>15 min</item>
+    <item>30 min</item>
+  </string-array>
+
+  <!-- Minimum required accuracy -->
+  <string-array name="min_required_accuracy_options">
+    <item>10 m (sehr gutes GPS-Signal)</item>
+    <item>20 m</item>
+    <item>50 m</item>
+    <item>100 m</item>
+    <item>200 m (empfohlen)</item>
+    <item>500 m</item>
+    <item>1000 m</item>
+    <item>2000 m</item>
+    <item>5000 m (sehr schlechtes GPS-Signal)</item>
+  </string-array>
+
+  <string-array name="min_required_accuracy_options_ft">
+    <item>33 Fuß (sehr gutes GPS-Signal)</item>
+    <item>66 Fuß</item>
+    <item>165 Fuß</item>
+    <item>328 Fuß</item>
+    <item>656 Fuß (empfohlen)</item>
+    <item>1640 Fuß</item>
+    <item>0,6 Meilen</item>
+    <item>1,2 Meilen</item>
+    <item>3,1 Meilen (sehr schlechtes GPS-Signal)</item>
+  </string-array>
+
+  <!-- Split frequency -->
+  <string-array name="split_frequency_options">
+    <item>Nicht zerteilen</item>
+    <item>100 km</item>
+    <item>50 km</item>
+    <item>25 km</item>
+    <item>10 km</item>
+    <item>5 km</item>
+    <item>1 km</item>
+    <item>60 min</item>
+    <item>30 min</item>
+    <item>15 min</item>
+    <item>10 min</item>
+    <item>5 min</item>
+    <item>2 min</item>
+    <item>1 min</item>
+  </string-array>
+
+  <string-array name="split_frequency_options_ft">
+    <item>Nicht zerteilen</item>
+    <item>100 meilen</item>
+    <item>50 meilen</item>
+    <item>25 meilen</item>
+    <item>10 meilen</item>
+    <item>5 meilen</item>
+    <item>1 meile</item>
+    <item>60 min</item>
+    <item>30 min</item>
+    <item>15 min</item>
+    <item>10 min</item>
+    <item>5 min</item>
+    <item>2 min</item>
+    <item>1 min</item>
+  </string-array>
+
+  <!-- Other non-preference arrays -->
+  <array name="activity_types">
+    <item>unbekannt</item>
+    <item>gemischt</item>
+    <item>andere</item>
+
+    <item>Jogging</item>
+    <item>Straßenlauf</item>
+    <item>Laufbahn</item>
+    <item>Geländelauf</item>
+    <item>Gehen</item>
+    <item>Schnelles Gehen</item>
+    <item>Wandern</item>
+    <item>Bergwandern</item>
+    <item>Bergsteigen</item>
+    <item>Trekking</item>
+
+    <item>Radfahren</item>
+    <item>Rennradfahren</item>
+    <item>Mountainbiking</item>
+    <item>Radwandern</item>
+
+    <item>Eislaufen</item>
+    <item>Inlineskaten</item>
+    <item>Skateboarden</item>
+
+    <item>Schneeschuhwandern</item>
+    <item>Skifahren</item>
+    <item>Snowboarden</item>
+    <item>Schlittenfahren</item>
+    <item>Eissegeln</item>
+
+    <item>Segeln</item>
+    <item>Kanadierfahren</item>
+    <item>Kajakfahren</item>
+    <item>Kanuwandern</item>
+    <item>Rudern</item>
+    <item>Motorbootfahren</item>
+    <item>Fähre</item>
+    <item>Ferngesteuertes Boot</item>
+    <item>Surfen</item>
+    <item>Windsurfen</item>
+    <item>Kitesurfen</item>
+    <item>Wasserski</item>
+    <item>Wakeboarden</item>
+
+    <item>Flugzeug</item>
+    <item>Segelflugzeug</item>
+    <item>Wasserflugzeug</item>
+    <item>Linienflugzeug</item>
+    <item>Hubschrauber</item>
+    <item>Heißluftballon</item>
+    <item>Luftschiff</item>
+    <item>Modellflugzeug</item>
+    <item>Modellhubschrauber</item>
+    <item>Fallschirmspringen</item>
+    <item>Gleitschirmfliegen</item>
+    <item>Hängegleiten</item>
+
+    <item>Reiten</item>
+    <item>Pferdewanderung</item>
+    <item>Eselreiten</item>
+
+    <item>Auto</item>
+    <item>Bus</item>
+    <item>Zug</item>
+    <item>Motorrad</item>
+    <item>Motorroller</item>
+    <item>Motocross</item>
+    <item>Quad</item>
+
+    <item>Strandsegeln</item>
+    <item>Frisbee</item>
+    <item>Ultimate Frisbee</item>
+  </array>
+
+  <array name="waypoint_types">
+    <item>Geldautomat</item>
+    <item>Bank</item>
+    <item>Kneipe</item>
+    <item>Grill</item>
+    <item>Gebäude</item>
+    <item>Bushaltestelle</item>
+    <item>Straßenbahnhaltestelle</item>
+    <item>Bahnhof</item>
+    <item>S-Bahnhof</item>
+    <item>Café</item>
+    <item>Lagerfeuer</item>
+    <item>Campingplatz</item>
+    <item>Zeltplatz</item>
+    <item>Kirche</item>
+    <item>Gasthaus</item>
+    <item>Kiosk</item>
+    <item>Trinkwasser</item>
+    <item>Geröll</item>
+    <item>Fähre</item>
+    <item>Feuerstelle</item>
+    <item>Feuerwache</item>
+    <item>Angelplatz</item>
+    <item>Tankstelle</item>
+    <item>Golfplatz</item>
+    <item>Lebensmittelgeschäft</item>
+    <item>Friseur</item>
+    <item>Hafen</item>
+    <item>Wanderweg</item>
+    <item>Hotel</item>
+    <item>Haus</item>
+    <item>Information</item>
+    <item>Kreuzung</item>
+    <item>Briefkasten</item>
+    <item>Marktplatz</item>
+    <item>Treffpunkt</item>
+    <item>Oper</item>
+    <item>Parkplatz</item>
+    <item>Post</item>
+    <item>Schlagloch</item>
+    <item>Polizeiwache</item>
+    <item>Bahnübergang</item>
+    <item>Restaurant</item>
+    <item>Shopping</item>
+    <item>Sehenswürdigkeit</item>
+    <item>Laden</item>
+    <item>Schwimmbad</item>
+    <item>Telefon</item>
+    <item>Theater</item>
+    <item>Toilette</item>
+    <item>Touristeninformation</item>
+    <item>Tunnel</item>
+    <item>Baum</item>
+    <item>Wasserfall</item>
+    <item>Wegpunkt</item>
+  </array>
+
+</resources>