Releasing version 1.0.20.

Fix a memory leak that was observed each time a recording session was stopped.
Merging Bart's fixes.
2026-10-23 02:35:18 +02:00 · 2010-11-23 15:18:39 -08:00 · 2010-11-21 23:49:17 -08:00 · 2010-11-21 21:11:35 -08:00 · 2010-11-21 21:07:59 -08:00 · 2010-11-21 20:55:44 -08:00
503 changed files with 18096 additions and 36559 deletions
@@ -2,10 +2,5 @@ syntax:glob

 */bin
 */gen/**
-*/proguard/**
 .metadata
-MyTracksTest/AnnotationProcessor.log
-**/*.pyc
-**/*.pyo
-syntax: glob
-MyTracksTest/hs_err_pid*.log
+MyTracksTest/annotations.log
@@ -2,20 +2,9 @@
 <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="lib" path="libs/google-common.jar"/>
+	<classpathentry kind="lib" path="libs/accounts.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"/>
+	<classpathentry kind="output" path="bin"/>
 </classpath>
@@ -3,7 +3,6 @@
 	<name>MyTracks</name>
 	<comment></comment>
 	<projects>
-		<project>MyTracksLib</project>
 	</projects>
 	<buildSpec>
 		<buildCommand>
@@ -1,4 +1,4 @@
-#Fri Oct 21 20:06:28 BRST 2011
+#Wed Sep 29 18:44:16 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
@@ -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
@@ -1,27 +1,11 @@
 <?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="35"
-          android:versionName="1.1.12">
+          android:versionCode="21"
+          android:versionName="1.0.20">
  <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 +13,10 @@ 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: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,112 +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.TrackDetail"
-              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:label="@string/my_tracks_importer"
-              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" />
@@ -158,58 +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.AggregatedStatsActivity"
+              android:label="@string/aggregated_stats" />
+
+    <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: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">
+    <receiver android:name="com.google.android.apps.mytracks.MyTracksReceiver">
      <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" />
+	  </intent-filter>
    </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" />
@@ -217,56 +102,22 @@ limitations under the License.

  <!-- 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"/>
+  <uses-feature android:name="android.hardware.touchscreen" 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"
@@ -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=""/>
@@ -16,8 +16,8 @@
 <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"/>
@@ -0,0 +1,62 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html lang="en-US" xml:lang="en-US" xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<title>My Tracks Welcome</title>
+</head>
+<body>
+<div>
+<img src="file:///android_asset/welcome.png" />
+
+<p>
+<b>What is My Tracks?</b><br>
+<i>My Tracks</i> is an application for your Android powered phone. With <i>My Tracks</i> you can record GPS tracks and visualize your hiking, running, biking or any other activity while watching live performance statistics. <i>My Tracks</i> makes it easy to archive your training history with <i>Google Docs</i> and <i>Google My Maps</i>, and share your activities with friends and the world.<br><br>
+
+<b>How do I see the map, statistics and elevation profile?</b><br>
+Touch the map. Left and right arrows will appear. Tap on these arrows to cycle between the map view, the track statistics view, and the elevation profile.<br> <br>
+
+<b>Why does the application sometimes display <i>Waiting for a better GPS fix. Make sure the sky is visible</i>?</b><br>
+For <i>My Tracks</i> to work, your phone needs to be in line-of-sight contact with the GPS satellites orbiting the earth. If line-of-sight is obstructed by trees, buildings or canyon walls, you may not get an accurate fix. If you see the message Waiting for a better GPS fix, wait a minute or two. If your device does not achieve a fix, move to an area clear of obstructions and try again.
+<br> <br>
+
+<b>How do I send my tracks to <i>Google My Maps</i> and <i>Google Docs</i>?</b><br>
+Tap the <i>Options</i> button located at the bottom right corner of the map and select <i>Send to Google...</i> Then choose to send the track to <i>Google My Maps</i> and/or <i>Google Docs</i>. The first time you do this, you may be prompted to log into your Google account. By default your track will be uploaded to a new <i>My Map</i> that will be created in your account. You can opt to add your track to an existing <i>My Map</i> if you prefer. In that case you will be asked to choose a <i>My Map</i> from your account. You can view and edit all of your <i>My Maps</i> by going to maps.google.com, signing in, and clicking on the <i>My Maps</i> tab.<br> <br>
+
+<b>How do I share tracks with friends and the rest of the world? </b><br>
+After recording a track, press the <i>Options</i> button on the bottom right of the map and then select <i>Share with friends...</i> Select how you want to share the track: a) as a link to a <i>Google My Map</i> (you will be prompted to upload the track to <i>Google My Maps</i> if you have not already done so), b) as a GPX file in an e-mail attachment, or c) as a KML file in an e-mail attachment. You can also send an e-mail with a link to your <i>My Map</i> by going to maps.google.com on your computer. Select the map and then click <i>Link</i> on the right side of the Google Maps web site.<br> <br>
+
+<b>Can I view other people's tracks on my Android phone?</b><br>
+Yes. Use the <i>Google My Maps Editor</i> application, available from the <i>Android Market</i>, to view tracks that have been uploaded to <a href="http://www.google.com/url?sa=D&amp;q=http%3A%2F%2Fmaps.google.com">maps.google.com</a> by you or your friends. If you have received an e-mail invitation to view a map, you can click on the link contained in the e-mail to view the map on your Android phone, assuming that <i>Google My Maps Editor</i> is installed on the phone.<br> <br>
+
+<b>What are way point markers?</b><br>
+Way point markers are used to annotate a place. For example if you are recording a track and you are close to an interesting place, let's say a mountain top, press <i>MENU | Markers | Insert Way point</i> to insert a way point marker at that location. Type a name and description for the place. Once you send your track to Google a place marker will show up on your map. People who view your maps can read your description and learn about this place.<br> <br>
+
+<b>What are statistics markers?</b><br>
+Let's say you are recording a bike ride up a hill. You will be able to see the total time and distance for the trip, but wouldn't it be good to know how long the climbing part took and how much altitude has been gained? That's what statistics marker are for. Insert a statistics marker once at the bottom of the hill, and once at the top. Now you will be able to view track statistics for each segment of your ride. Each marker has the statistic for the segment up to the marker. Note: To insert a statistics marker simply press the track ball (while the <i>My Tracks</i> application is in the foreground), or use <i>MENU | Markers | Insert Statistics</i>.<br> <br>
+
+<b>Do I need a cell signal and data connection to use <i>My Tracks</i>?</b><br>
+A cell signal or data connection is not required to record GPS tracks. However, if there is no data connection, you will not be able to see satellite imagery or a map. Instead, you will see a grey screen or partial map. Tracks, represented as simple lines, can still be recorded even if there is no data connection.<br> <br>
+
+<b>How long does the battery last when recording tracks?</b><br>
+The GPS receiver draws a relatively high amount of power, so a fully charged battery typically survives less than 5 hours. Battery life depends on many factors, including signal strength, battery freshness, and tasks running in parallel. Switching off some or all of the phone's radios will lengthen battery life. Putting the phone into Airplane mode will yield the best results.<br> <br>
+
+<b>What can I do with tracks after saving them as GPX or KML files to the SD card or sharing such files with friends?</b><br> GPX and KML are standard file formats for storing data from GPS receivers. You can use Google Earth or similar applications to visualize and edit GPS tracks. Go to http://earth.google.com to download the latest version of Google Earth for free.<br> <br>
+
+<b>How precise are the recorded tracks?</b><br>
+Under optimal conditions the location error can be +/- 20 feet (6 meters). However, precision depends on the quality of the GPS signal. Your phone needs to be in line-of-sight contact with the GPS satellites orbiting the earth. The signal will be best in open areas free of trees, buildings, canyon walls and other obstructions. The blue circle around the orange location arrow indicates estimated precision. (You may need to zoom in or out to see the circle.) If the precision is too low, a message at the top of the screen will alert you and tracks will not be recorded. You can change the minimum required precision in the <i>My Tracks</i> Settings (See: <i>MENU | Settings | Pause recording if accuracy drops below</i>).<br> <br>
+
+<b> How precise is the elevation measurement?</b><br>
+GPS receivers measure elevations much less precisely than latitude and longitude. Elevations can sometimes be off by a few hundred feet, though relative changes are tracked more precisely. To get a good elevation measurement make sure that you have a strong GPS signal (good sky visibility) and wait a few minutes for the elevation to settle to a stable value.<br> <br>
+
+<b>Can I edit the tracks and correct them for inaccuracies?</b><br>
+Once you upload tracks to <i>Google My Maps</i>, you can move, delete or insert individual track points as desired.<br> <br>
+
+<b>Why do very long tracks split into multiple segments upon sending them to <i>Google My Maps</i>? </b><br>
+Tracks on maps.google.com are limited to 500 points or less. As a result, long tracks are split into multiple pieces upon upload to <i>Google My Maps</i>.<br><br>
+
+<b>How do I delete all tracks from my phone?</b><br> Press the MENU button and select List tracks. Tap the Delete all tracks button. This permanently deletes the recorded GPS tracks from memory. If you have saved tracks to the SD card, you must delete them separately. Tracks uploaded to <i>Google My Maps</i> and <i>Google Docs</i> must also be deleted separately.<br> <br>
+
+<b>Who can see maps I send to maps.google.com?</b><br> By default new maps that you send to maps.google.com will be publicly visible. To prevent newly created maps from being public, go to the <i>My Tracks</i> settings screen and deselect the check box labeled <i>Make maps public on maps.google.com</i>. You can change the visibility of existing maps through the maps.google.com web site or using the <i>Google My Maps Editor</i> application from your Android phone.<br> <br> <br><br>
+
+</div>
+</body>
+</html>
@@ -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
@@ -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/.
@@ -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
-
@@ -14,90 +14,114 @@ 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.
 -->
-<ScrollView
+<TableLayout
  xmlns:android="http://schemas.android.com/apk/res/android"
  android:layout_height="wrap_content"
-  android:layout_width="wrap_content">  
-  <TableLayout
-    android:layout_height="wrap_content"
-    android:layout_width="wrap_content"
-    android:padding="2dp"
-    android:shrinkColumns="0"
-    android:stretchColumns="1">
-    <TableRow style="@style/AboutTableRow">
-      <ImageView
-        android:layout_column="0"
-        android:scaleType="center"
-        android:src="@drawable/arrow_icon"/>
-      <LinearLayout
-        android:layout_column="1"
+  android:layout_width="wrap_content"
+  android:stretchColumns="2">
+  <TableRow>
+    <ImageView
+      android:layout_column="1"
+      android:src="@drawable/arrow_icon" />
+    <LinearLayout
+      android:layout_column="2"
+      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:orientation="vertical">
-        <TextView
-          android:layout_height="wrap_content"
-          android:layout_width="wrap_content"
-          android:text="@string/my_tracks_app_name"
-          android:textSize="30sp" />
-        <TextView
-          android:layout_height="wrap_content"
-          android:layout_width="wrap_content"
-          android:text="@string/about_copyright_notice"
-          android:textSize="15sp" />
-      </LinearLayout>
-    </TableRow>
-    <TableRow style="@style/AboutTableRow">
+        android:text="@string/app_name"
+        android:textSize="30sp" />
      <TextView
-        android:text="@string/about_team"
-        style="@style/AboutTextView.Column0"/>
-      <LinearLayout
-        android:layout_column="1"
        android:layout_height="wrap_content"
        android:layout_width="wrap_content"
-        android:orientation="vertical">
-        <TextView
-          android:text="@string/about_bart"
-          style="@style/AboutTextView"/>
-        <TextView
-          android:text="@string/about_dylan"
-          style="@style/AboutTextView"/>
-        <TextView
-          android:text="@string/about_jimmy"
-          style="@style/AboutTextView"/>
-        <TextView
-          android:text="@string/about_leif"
-          style="@style/AboutTextView"/>
-        <TextView
-          android:text="@string/about_rodrigo"
-          style="@style/AboutTextView"/>
-        <TextView
-          android:text="@string/about_sandor"
-          style="@style/AboutTextView"/>
-      </LinearLayout>
-    </TableRow>
-    <TableRow style="@style/AboutTableRow">
+        android:text="@string/about_copyright_message"
+        android:textSize="15sp" />
+    </LinearLayout>
+  </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_team"
+      android:textSize="20sp" />
+    <LinearLayout
+      android:layout_column="2"
+      android:layout_height="wrap_content"
+      android:layout_width="wrap_content"
+      android:orientation="vertical">
      <TextView
-        android:text="@string/about_version"
-        style="@style/AboutTextView.Column0"/>
+        android:layout_height="wrap_content"
+        android:layout_width="wrap_content"
+        android:text="@string/about_dylan"
+        android:textSize="20sp" />
      <TextView
-        android:id="@+id/about_version"
-        style="@style/AboutTextView"/>
-    </TableRow>
-    <TableRow style="@style/AboutTableRow">
+        android:layout_height="wrap_content"
+        android:layout_width="wrap_content"
+        android:text="@string/about_leif"
+        android:textSize="20sp" />
      <TextView
-        android:text="@string/about_support"
-        style="@style/AboutTextView.Column0"/>
+        android:layout_height="wrap_content"
+        android:layout_width="wrap_content"
+        android:text="@string/about_rdamazio"
+        android:textSize="20sp" />
      <TextView
-        android:text="@string/my_tracks_web_url"
-        style="@style/AboutTextView.Url"/>
-    </TableRow>  
-    <TableRow style="@style/AboutTableRow">
-      <TextView
-        android:text="@string/about_privacy"
-        style="@style/AboutTextView.Column0"/>
-      <TextView
-        android:text="@string/my_tracks_privacy_url"
-        style="@style/AboutTextView.Url"/>
-    </TableRow>
-  </TableLayout>
-</ScrollView>
+        android:layout_height="wrap_content"
+        android:layout_width="wrap_content"
+        android:text="@string/about_sandor"
+        android:textSize="20sp" />
+    </LinearLayout>
+  </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_version"
+      android:textSize="20sp" />
+    <TextView
+      android:layout_height="wrap_content"
+      android:id="@+id/about_version_register"
+      android:layout_width="wrap_content"
+      android:text="@string/unknown"
+      android:textSize="20sp" />
+  </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_support"
+      android:textSize="20sp" />
+    <TextView
+      android:autoLink="web"
+      android:layout_height="wrap_content"
+      android:layout_width="wrap_content"
+      android:text="@string/about_weburl"
+      android:textSize="18sp" />
+  </TableRow>
+
+  <View
+    android:layout_height="4dip" />
+
+</TableLayout>
@@ -15,135 +15,119 @@ 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:id="@+id/screen"
+  android:layout_width="200dip"
  android:layout_height="fill_parent"
-  android:layout_width="fill_parent"
-  android:minWidth="300dp"
  android:orientation="vertical">
  <LinearLayout
-    android:background="@drawable/list_bar"
+    android:layout_width="fill_parent"
    android:layout_height="wrap_content"
-    android:layout_width="fill_parent">
+    android:background="@drawable/list_bar">
    <TextView
-      android:layout_height="wrap_content"
-      android:layout_marginLeft="10dp"
      android:layout_width="fill_parent"
-      android:text="@string/menu_chart_view_chart_settings"
+      android:layout_height="wrap_content"
+      android:text="@string/chart_settings"
+      android:textSize="20dip"
      android:textColor="#fff"
-      android:textSize="20sp"/>
+      android:layout_marginLeft="10dip"/>
  </LinearLayout>
  <ScrollView
-    android:layout_height="0dp"
-    android:layout_weight="1"
-    android:layout_width="fill_parent">
+    android:layout_width="fill_parent"
+    android:layout_height="wrap_content"
+    android:layout_weight="1">
    <TableLayout
-      android:layout_height="wrap_content"
-      android:layout_marginLeft="5dp"
-      android:layout_marginTop="5dp"
      android:layout_width="fill_parent"
-      android:stretchColumns="1">
+      android:layout_height="wrap_content"
+      android:stretchColumns="1"
+      android:layout_marginTop="5dip"
+      android:layout_marginLeft="5dip">
      <TableRow>
        <LinearLayout
-          android:layout_height="wrap_content"
-          android:layout_marginLeft="10dp"
          android:layout_width="fill_parent"
-          android:orientation="vertical">
+          android:layout_height="wrap_content"
+          android:orientation="vertical"
+          android:layout_marginLeft="10dip">
          <LinearLayout
-            android:layout_height="wrap_content"
            android:layout_width="fill_parent"
-            android:orientation="horizontal">
-            <ImageView
-              android:layout_height="wrap_content"
-              android:layout_width="wrap_content"
-              android:src="@drawable/x_axis"/>
-            <TextView
-              android:layout_height="wrap_content"
-              android:layout_width="fill_parent"
-              android:text="@string/chart_settings_x_axis"
-              android:textSize="20sp"/>
-          </LinearLayout>
-          <RadioGroup
-            android:id="@+id/chart_settings_x"
            android:layout_height="wrap_content"
-            android:layout_width="fill_parent">
-            <RadioButton
-              android:id="@+id/chart_settings_by_distance"
-              android:layout_height="wrap_content"
+            android:orientation="horizontal">
+            <ImageView android:src="@drawable/x_axis"
+              android:layout_width="wrap_content"
+              android:layout_height="wrap_content"/>
+            <TextView
              android:layout_width="fill_parent"
-              android:text="@string/chart_settings_by_distance"/>
-            <RadioButton
-              android:id="@+id/chart_settings_by_time"
              android:layout_height="wrap_content"
+              android:text="@string/x_axis"
+              android:textSize="20dip" />
+          </LinearLayout>
+          <RadioGroup  android:id="@+id/chart_settings_x"
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content">
+            <RadioButton android:id="@+id/chart_settings_by_distance"
              android:layout_width="fill_parent"
-              android:text="@string/chart_settings_by_time"/>
+              android:layout_height="wrap_content"
+              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/by_time"/>
          </RadioGroup>
        </LinearLayout>
      </TableRow>
      <TableRow>
        <LinearLayout
-          android:layout_height="wrap_content"
-          android:layout_marginLeft="10dp"
          android:layout_width="fill_parent"
-          android:orientation="vertical">
+          android:layout_height="wrap_content"
+          android:orientation="vertical"
+          android:layout_marginLeft="10dip">
          <LinearLayout
-            android:layout_height="wrap_content"
            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
            android:orientation="horizontal">
-            <ImageView
-              android:layout_height="wrap_content"
+            <ImageView android:src="@drawable/y_axis"
              android:layout_width="wrap_content"
-              android:src="@drawable/y_axis"/>
+              android:layout_height="wrap_content"/>
            <TextView
-              android:layout_height="wrap_content"
              android:layout_width="fill_parent"
-              android:text="@string/chart_settings_y_axis"
-              android:textSize="20sp" />
+              android:layout_height="wrap_content"
+              android:text="@string/y_axis"
+              android:textSize="20dip" />
          </LinearLayout>
-          <CheckBox
-            android:id="@+id/chart_settings_elevation"
+          <CheckBox android:id="@+id/chart_settings_elevation"
            android:checked="true"
-            android:layout_height="wrap_content"
            android:layout_width="fill_parent"
-            android:text="@string/stat_elevation"/>
-          <CheckBox
-            android:id="@+id/chart_settings_speed"
+            android:layout_height="wrap_content"
+            android:text="@string/elevation"/>
+          <CheckBox android:id="@+id/chart_settings_speed"
            android:checked="true"
-            android:layout_height="wrap_content"
            android:layout_width="fill_parent"
-            android:text="@string/stat_speed"/>
-          <CheckBox
-            android:id="@+id/chart_settings_power"
-            android:checked="true"
            android:layout_height="wrap_content"
-            android:layout_width="fill_parent"
-            android:text="@string/sensor_state_power"/>
-          <CheckBox
-            android:id="@+id/chart_settings_cadence"
-            android:checked="true"
-            android:layout_height="wrap_content"
-            android:layout_width="fill_parent"
-            android:text="@string/sensor_state_cadence"/>
-          <CheckBox
-            android:id="@+id/chart_settings_heart_rate"
-            android:checked="true"
-            android:layout_height="wrap_content"
-            android:layout_width="fill_parent"
-            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"/>
-    <Button
-      android:id="@+id/chart_settings_cancel"
+  <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>
@@ -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"
@@ -0,0 +1,88 @@
+<?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.
+-->
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+  android:orientation="vertical"
+  android:layout_width="fill_parent"
+  android:layout_height="fill_parent"
+  android:paddingTop="10dip"
+  android:background="#c000">
+  <TextView android:text="@string/trackdetails_name"
+    android:layout_width="fill_parent"
+    android:layout_height="wrap_content"/>
+  <LinearLayout
+    android:layout_width="fill_parent"
+    android:layout_height="wrap_content"
+    android:orientation="horizontal">
+    <ImageView android:id="@+id/trackdetails_icon"
+      android:src="@drawable/track"
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      android:layout_gravity="center"
+      android:paddingLeft="4dip"
+      android:paddingRight="4dip"/>
+    <EditText android:id="@+id/trackdetails_name"
+      android:layout_width="fill_parent"
+      android:layout_height="wrap_content"
+      android:singleLine="true"
+      android:autoText="true"
+      android:capitalize="words"
+      android:selectAllOnFocus="true"/>
+  </LinearLayout>
+  <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"/>
+  <TextView android:text="@string/trackdetails_description"
+    android:layout_width="fill_parent"
+    android:layout_height="wrap_content"/>
+  <EditText android:id="@+id/trackdetails_description"
+    android:layout_width="fill_parent"
+    android:layout_height="0dip"
+    android:singleLine="false"
+    android:autoText="true"
+    android:capitalize="sentences"
+    android:selectAllOnFocus="true"
+    android:maxLines="50"
+    android:gravity="top"
+    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>
@@ -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"
@@ -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"
@@ -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>
@@ -15,124 +15,115 @@ 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_height="fill_parent"
+  android:id="@+id/screen"
  android:layout_width="fill_parent"
+  android:layout_height="fill_parent"
  android:orientation="vertical">
  <LinearLayout
-    android:background="@drawable/list_bar"
+    android:layout_width="fill_parent"
    android:layout_height="wrap_content"
-    android:layout_width="fill_parent">
+    android:background="@drawable/list_bar">
    <TextView
-      android:layout_height="wrap_content"
-      android:layout_marginLeft="10dip"
      android:layout_width="fill_parent"
-      android:text="@string/send_google_title"
+      android:layout_height="wrap_content"
+      android:text="@string/sendtogoogle_title"
+      android:textSize="20dip"
      android:textColor="#fff"
-      android:textSize="20dip"/>
+      android:layout_marginLeft="10dip"/>
  </LinearLayout>
-  <ScrollView
+  <ScrollView android:id="@+id/sendtogoogle_scrollview"
+    android:layout_width="fill_parent"
    android:layout_height="0dip"
-    android:layout_marginBottom="5dip"
-    android:layout_marginLeft="5dip"
-    android:layout_marginTop="5dip"
-    android:layout_weight="1"
-    android:layout_width="fill_parent">
+    android:layout_weight="1">
    <TableLayout
-      android:layout_height="wrap_content"
      android:layout_width="fill_parent"
-      android:stretchColumns="1">
-      
-      <!-- Google My Maps -->
+      android:layout_height="wrap_content"
+      android:stretchColumns="1"
+      android:layout_marginTop="5dip"
+      android:layout_marginLeft="5dip">
      <TableRow>
-        <ImageView
-          android:layout_height="wrap_content"
+        <ImageView android:src="@drawable/mymaps_icon"
          android:layout_width="wrap_content"
-          android:src="@drawable/mymaps_icon"/>
+          android:layout_height="wrap_content"/>
        <LinearLayout
-          android:layout_height="wrap_content"
-          android:layout_marginLeft="10dip"
          android:layout_width="fill_parent"
-          android:orientation="vertical">
-          <CheckBox
-            android:checked="true"
-            android:id="@+id/send_google_my_maps"
-            android:layout_height="wrap_content"
+          android:layout_height="wrap_content"
+          android:orientation="vertical"
+          android:layout_marginLeft="10dip">
+          <CheckBox android:id="@+id/sendtogoogle_google_mymaps"
            android:layout_width="fill_parent"
-            android:text="@string/send_google_my_maps"
-            android:textSize="18dip"/>
-          <RadioGroup
-            android:id="@+id/send_google_my_maps_group"
            android:layout_height="wrap_content"
-            android:layout_width="fill_parent">
-            <RadioButton
-              android:id="@+id/send_google_new_map"
-              android:layout_height="wrap_content"
+            android:text="@string/sendtogoogle_google_mymaps"
+            android:textSize="20dip"
+            android:checked="true"/>
+          <RadioGroup android:id="@+id/sendtogoogle_group_mymaps"
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content">
+            <RadioButton android:id="@+id/sendtogoogle_create_new_map"
              android:layout_width="fill_parent"
-              android:text="@string/send_google_new_map"/>
-            <RadioButton
-              android:id="@+id/send_google_existing_map"
              android:layout_height="wrap_content"
+              android:text="@string/sendtogoogle_create_new_map"/>
+            <RadioButton android:id="@+id/sendtogoogle_pick_existing_map"
              android:layout_width="fill_parent"
-              android:text="@string/send_google_existing_map"/>
+              android:layout_height="wrap_content"
+              android:text="@string/sendtogoogle_pick_existing_map"/>
          </RadioGroup>
        </LinearLayout>
      </TableRow>
-
-      <!-- Google Fusion Tables -->
      <TableRow>
-        <ImageView
-          android:layout_height="wrap_content"
+        <ImageView android:src="@drawable/googledocs_icon"
          android:layout_width="wrap_content"
-          android:src="@drawable/googledocs_icon"/>
+          android:layout_height="wrap_content"/>
        <LinearLayout
-          android:layout_height="wrap_content"
-          android:layout_marginLeft="10dip"
          android:layout_width="fill_parent"
-          android:orientation="vertical">
-          <CheckBox
-            android:checked="true"
-            android:id="@+id/send_google_fusion_tables"
-            android:layout_height="wrap_content"
-            android:layout_width="fill_parent"
-            android:text="@string/send_google_fusion_tables"
-            android:textSize="18dip"/>
-        </LinearLayout>
-      </TableRow>
-
-      <!-- Google Docs -->
-      <TableRow android:id="@+id/send_google_docs_table_row">
-        <ImageView
          android:layout_height="wrap_content"
-          android:layout_width="wrap_content"
-          android:src="@drawable/googledocs_icon"/>
-        <LinearLayout
-          android:layout_height="wrap_content"
-          android:layout_marginLeft="10dip"
-          android:layout_width="fill_parent"
-          android:orientation="vertical">
-          <CheckBox
-            android:checked="true"
-            android:id="@+id/send_google_docs"
-            android:layout_height="wrap_content"
+          android:orientation="vertical"
+          android:layout_marginLeft="10dip">
+          <CheckBox android:id="@+id/sendtogoogle_google_docs"
            android:layout_width="fill_parent"
-            android:text="@string/send_google_docs"
-            android:textSize="18dip"/>
+            android:layout_height="wrap_content"
+            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/send_google_send_now"
-      android:layout_gravity="left"
-      android:text="@string/send_google_send_now"
-      style="@style/Button"/>
-    <Button
-      android:id="@+id/send_google_cancel"
+  <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>
@@ -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>
@@ -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>
@@ -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>
@@ -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>
@@ -1,80 +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.
-->
-<LinearLayout
-  xmlns:android="http://schemas.android.com/apk/res/android"
-  android:layout_height="fill_parent"
-  android:layout_width="fill_parent"
-  android:orientation="vertical">
-  <ScrollView
-    android:layout_height="0dp"
-    android:layout_weight="1"
-    android:layout_width="fill_parent">
-    <LinearLayout 
-      android:layout_height="wrap_content"
-      android:layout_width="fill_parent"
-      android:orientation="vertical">
-
-      <!-- Sensor state -->
-      <TextView
-        android:text="@string/menu_sensor_state"
-        style="@style/SensorStateLabel"/>
-      <TextView
-        android:id="@+id/sensor_state"
-        style="@style/SensorStateValue"/>
-  
-      <!--  Last sensor time -->
-      <TextView
-        android:text="@string/sensor_state_last_sensor_time"
-        style="@style/SensorStateLabel"/>
-      <TextView
-        android:id="@+id/sensor_state_last_sensor_time"
-        style="@style/SensorStateValue"/>
-  
-      <!-- Power -->
-      <TextView
-        android:text="@string/sensor_state_power"
-        style="@style/SensorStateLabel"/>
-      <TextView
-        android:id="@+id/sensor_state_power"
-        style="@style/SensorStateValue"/>
-  
-      <!-- Cadence -->
-      <TextView
-        android:text="@string/sensor_state_cadence"
-        style="@style/SensorStateLabel"/>
-      <TextView
-        android:id="@+id/sensor_state_cadence"
-        style="@style/SensorStateValue"/>
-  
-      <!-- Heart rate -->
-      <TextView
-        android:text="@string/sensor_state_heart_rate"
-        style="@style/SensorStateLabel"/>
-      <TextView
-        android:id="@+id/sensor_state_heart_rate"
-        style="@style/SensorStateValue"/>
-  
-      <!-- Battery level -->
-      <TextView
-        android:text="@string/sensor_state_battery"
-        style="@style/SensorStateLabel"/>
-      <TextView
-        android:id="@+id/sensor_state_battery"
-        style="@style/SensorStateValue"/>
-    </LinearLayout>
-  </ScrollView>
-</LinearLayout>
@@ -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>
@@ -1,112 +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.
-->
-<LinearLayout
-  xmlns:android="http://schemas.android.com/apk/res/android"
-  android:layout_height="fill_parent"
-  android:layout_width="fill_parent"
-  android:orientation="vertical"
-  >
-  <ScrollView
-    android:background="@color/black"
-    android:layout_height="0dp"
-    android:layout_weight="1"
-    android:layout_width="fill_parent"
-    >
-    <LinearLayout 
-      android:layout_height="wrap_content"
-      android:layout_width="fill_parent"
-      android:orientation="vertical"
-      android:padding="4dp"
-      >
-      <TextView
-        android:layout_height="wrap_content"
-        android:layout_width="fill_parent"
-        android:text="@string/track_detail_track_name"
-        />
-      <LinearLayout
-        android:layout_height="wrap_content"
-        android:layout_width="fill_parent"
-        android:orientation="horizontal"
-        >
-        <ImageView
-          android:layout_gravity="center"
-          android:layout_height="wrap_content"
-          android:layout_width="wrap_content"
-          android:paddingLeft="4dp"
-          android:paddingRight="4dp"
-          android:src="@drawable/track"
-          />
-        <EditText
-          android:autoText="true"
-          android:capitalize="words"
-          android:hint="@string/track_detail_track_name"
-          android:id="@+id/track_detail_track_name"
-          android:imeOptions="actionNext"
-          android:layout_height="wrap_content"
-          android:layout_width="fill_parent"
-          android:selectAllOnFocus="true"
-          android:singleLine="true"
-          />
-      </LinearLayout>
-      <TextView
-        android:layout_height="wrap_content"
-        android:layout_width="fill_parent"
-        android:text="@string/track_detail_activity_type"
-        />
-      <AutoCompleteTextView
-        android:id="@+id/track_detail_activity_type"
-        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:layout_height="wrap_content"
-        android:layout_width="fill_parent"
-        android:text="@string/track_detail_track_description"
-        />
-      <EditText
-        android:autoText="true"
-        android:capitalize="sentences"
-        android:hint="@string/track_detail_track_description"
-        android:id="@+id/track_detail_track_description"
-        android:imeOptions="actionDone"
-        android:layout_height="wrap_content"
-        android:layout_width="fill_parent"
-        android:maxLines="50"
-        android:selectAllOnFocus="true"
-        android:singleLine="false"
-        />
-    </LinearLayout>
-  </ScrollView>
-  <LinearLayout style="@style/ButtonLayout">
-    <LinearLayout style="@style/ButtonSpacer"/>
-    <Button
-      android:id="@+id/track_detail_save"
-      android:layout_gravity="left"
-      android:text="@string/generic_save"
-      style="@style/Button"
-      />
-    <Button
-      android:id="@+id/track_detail_cancel"
-      android:layout_gravity="right"
-      android:text="@string/generic_cancel"
-      style="@style/Button"
-      />
-    <LinearLayout style="@style/ButtonSpacer"/>
-  </LinearLayout>
-</LinearLayout>
@@ -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/WidgetTextView.Value"
-          android:id="@+id/appwidget_distance_text" />
-        <TextView
-          style="@style/WidgetTextView"
-          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/WidgetTextView.Value"
-          android:id="@+id/appwidget_time_text" />
-        <TextView
-          style="@style/WidgetTextView"
-          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/WidgetTextView.Value"
-          android:id="@+id/appwidget_speed_text" />
-        <TextView
-          style="@style/WidgetTextView"
-          android:text="@string/stat_speed" />
-      </LinearLayout>
-    </LinearLayout>
-  </LinearLayout>
-</LinearLayout>
@@ -16,139 +16,38 @@ limitations under the License.
 -->
 <LinearLayout
  xmlns:android="http://schemas.android.com/apk/res/android"
-  android:layout_height="fill_parent"
  android:layout_width="fill_parent"
+  android:layout_height="fill_parent"
  android:orientation="vertical">
-  <ScrollView
-    android:background="@color/white"
-    android:layout_height="0dp"
-    android:layout_weight="1"
-    android:layout_width="fill_parent">
-    <LinearLayout 
-      android:layout_height="wrap_content"
-      android:layout_width="fill_parent"
-      android:orientation="vertical">
-      <ImageView
-        android:layout_height="wrap_content"
-        android:layout_width="wrap_content"
-        android:scaleType="fitStart"
-        android:src="@drawable/arrow_icon"/>
-      <TextView
-        android:text="@string/welcome_my_tracks_question"
-        style="@style/WelcomeTextView.Question"/>
-      <TextView
-        android:text="@string/welcome_my_tracks_answer"
-        style="@style/WelcomeTextView"/>
-      <TextView
-        android:text="@string/welcome_app_navigation_question"
-        style="@style/WelcomeTextView.Question"/>
-      <TextView
-        android:text="@string/welcome_app_navigation_answer"
-        style="@style/WelcomeTextView"/>
-      <TextView
-        android:text="@string/welcome_add_graph_question"
-        style="@style/WelcomeTextView.Question"/>
-      <TextView
-        android:text="@string/welcome_add_graph_answer"
-        style="@style/WelcomeTextView"/>
-      <TextView
-        android:text="@string/welcome_gps_fix_question"
-        style="@style/WelcomeTextView.Question"/>
-      <TextView
-        android:text="@string/welcome_gps_fix_answer"
-        style="@style/WelcomeTextView"/>
-      <TextView
-        android:text="@string/welcome_send_google_question"
-        style="@style/WelcomeTextView.Question"/>
-      <TextView
-        android:text="@string/welcome_send_google_answer"
-        style="@style/WelcomeTextView"/>
-      <TextView
-        android:text="@string/welcome_share_friends_question"
-        style="@style/WelcomeTextView.Question"/>
-      <TextView
-        android:text="@string/welcome_share_friends_answer"
-        style="@style/WelcomeTextView"/>
-      <TextView
-        android:text="@string/welcome_waypoint_marker_question"
-        style="@style/WelcomeTextView.Question"/>
-      <TextView
-        android:text="@string/welcome_waypoint_marker_answer"
-        style="@style/WelcomeTextView"/>
-      <TextView
-        android:text="@string/welcome_statistics_marker_question"
-        style="@style/WelcomeTextView.Question"/>
-      <TextView
-        android:text="@string/welcome_statistics_marker_answer"
-        style="@style/WelcomeTextView"/>      
-      <TextView
-        android:text="@string/welcome_data_connection_question"
-        style="@style/WelcomeTextView.Question"/>
-      <TextView
-        android:text="@string/welcome_data_connection_answer"
-        style="@style/WelcomeTextView"/>  
-      <TextView
-        android:text="@string/welcome_battery_life_question"
-        style="@style/WelcomeTextView.Question"/>
-      <TextView
-        android:text="@string/welcome_battery_life_answer"
-        style="@style/WelcomeTextView"/> 
-      <TextView
-        android:text="@string/welcome_share_file_question"
-        style="@style/WelcomeTextView.Question"/>
-      <TextView
-        android:text="@string/welcome_share_file_answer"
-        style="@style/WelcomeTextView"/> 
-      <TextView
-        android:text="@string/welcome_location_precision_question"
-        style="@style/WelcomeTextView.Question"/>
-      <TextView
-        android:text="@string/welcome_location_precision_answer"
-        style="@style/WelcomeTextView"/> 
-      <TextView
-        android:text="@string/welcome_elevation_precision_question"
-        style="@style/WelcomeTextView.Question"/>
-      <TextView
-        android:text="@string/welcome_elevation_precision_answer"
-        style="@style/WelcomeTextView"/>                               
-      <TextView
-        android:text="@string/welcome_edit_accuracy_question"
-        style="@style/WelcomeTextView.Question"/>
-      <TextView
-        android:text="@string/welcome_edit_accuracy_answer"
-        style="@style/WelcomeTextView"/>     
-      <TextView
-        android:text="@string/welcome_split_track_question"
-        style="@style/WelcomeTextView.Question"/>
-      <TextView
-        android:text="@string/welcome_split_track_answer"
-        style="@style/WelcomeTextView"/>           
-      <TextView
-        android:text="@string/welcome_delete_all_question"
-        style="@style/WelcomeTextView.Question"/>
-      <TextView
-        android:text="@string/welcome_delete_all_answer"
-        style="@style/WelcomeTextView"/>     
-      <TextView
-        android:text="@string/welcome_my_maps_sharing_question"
-        style="@style/WelcomeTextView.Question"/>
-      <TextView
-        android:text="@string/welcome_my_maps_sharing_answer"
-        style="@style/WelcomeTextView"/>    
-    </LinearLayout>
-  </ScrollView>
-  <LinearLayout style="@style/ButtonLayout">
-    <LinearLayout style="@style/ButtonSpacer"/>
-    <Button
-      android:id="@+id/welcome_ok"
-      android:layout_gravity="left"
-      android:text="@string/generic_ok"
-      style="@style/Button"/>
+  <WebView
+    android:id="@+id/welcome_web"
+    android:layout_width="fill_parent"
+    android:layout_height="fill_parent"
+    android:layout_weight="1" />
+  <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_gravity="right"
+      android:layout_width="wrap_content"
+      android:layout_height="48dip"
+      android:layout_gravity="left"
      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>
@@ -1,37 +1,34 @@
 <?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"/>
+    android:title="@string/settings"/>
    
-  <item android:id="@+id/menu_aggregated_statistics"
+  <item android:id="@+id/menu_aggregated_stats"
+    android:icon="@android:drawable/ic_menu_info_details"
    android:orderInCategory="1002"
-    android:title="@string/menu_aggregated_statistics"/>
-    
+    android:title="@string/aggregated_stats"/>
+
  <item android:id="@+id/menu_help"
    android:icon="@android:drawable/ic_menu_info_details"
    android:orderInCategory="1003"
-    android:title="@string/menu_help"/>
+    android:title="@string/help"/>
+
 </menu>
@@ -0,0 +1,43 @@
+End User License Agreement
+
+By downloading, installing or using this application or any portion thereof ("Application"), you agree to the following terms and conditions (the "Terms and Conditions").
+
+1.      USE OF APPLICATION
+a.       Google grants you the non-exclusive, non-transferable, limited right and license to install and use this Application solely and exclusively for your personal use.
+b.       You may not use the Application in any manner that could damage, disable, overburden, or impair the Application (or servers or networks connected to the Application), nor may you use the Application in any manner that could interfere with any other party's use and enjoyment of the Application (or servers or networks connected to the Application).
+c.        You agree that you are solely responsible for (and that Google has no responsibility to you or to any third party for) your use of the Application, any breach of your obligations under the Terms and Conditions, and for the consequences (including any loss or damage which Google may suffer) of any such breach.
+
+2.      PROPRIETARY RIGHTS
+You acknowledge that (a) the Application contains proprietary and confidential information that is protected by applicable intellectual property and other laws, and (b) Google and/or third parties own all right, title and interest in and to the Application and content, excluding content provided by you,  that may be presented or accessed through the Application, including without limitation all Intellectual Property Rights therein and thereto. "Intellectual Property Rights" means any and all rights existing from time to time under patent law, copyright law, trade secret law, trademark law, unfair competition law, and any and all other proprietary rights, and any and all applications, renewals, extensions and restorations thereof, now or hereafter in force and effect worldwide.  You agree that you will not, and will not allow any third party to, (i) copy, sell, license, distribute, transfer, modify, adapt, translate, prepare derivative works from, decompile, reverse engineer, disassemble or otherwise attempt to derive source code from the Application or content that may be presented or accessed through the Application for any purpose, unless otherwise permitted, (ii) take any action to circumvent or defeat the security or content usage rules provided, deployed or enforced by any functionality (including without limitation digital rights management functionality) contained in the Application, (iii) use the Application to access, copy, transfer, transcode or retransmit content in violation of any law or third party rights, or (iv) remove, obscure, or alter Google's or any third party's copyright notices, trademarks, or other proprietary rights notices affixed to or contained within or accessed in conjunction with or through the Application.
+
+3.      GOOGLE TERMS OF SERVICE AND PRIVACY POLICY
+a.     Google’s Privacy Policy (located at http://www.google.com/privacypolicy.html) explains how Google treats your information and protects your privacy when you use the Application.  You agree to the use of your data in accordance with Google’s privacy policies.
+b.     The Application may contain features that are used in conjunction with Google’s search and other services.  Accordingly, your use of such features of the Application is also governed by Google’s Terms of Service located at http://www.google.com/terms_of_service.html, Google’s Privacy Policy located at http://www.google.com/privacypolicy.html, as well as any applicable Google Service-specific Terms of Service and Privacy Policy, which may be updated from time to time and without notice.
+
+4.      U.S. GOVERNMENT RESTRICTED RIGHTS
+This Application, related materials and documentation have been developed entirely with private funds.  If the user of the Application is an agency, department, employee, or other entity of the United States Government, the use, duplication, reproduction, release, modification, disclosure, or transfer of the Application, including technical data or manuals, is restricted by the terms, conditions and covenants contained in these Terms and Conditions.  In accordance with Federal Acquisition Regulation 12.212 for civilian agencies and Defense Federal Acquisition Regulation Supplement 227.7202 for military agencies, use of the Application is further restricted by these Terms and Conditions.
+
+5.      EXPORT RESTRICTIONS
+The Application may be subject to export controls or restrictions by the United States or other countries or territories.  You agree to comply with all applicable U.S. and international export laws and regulations.  These laws include restrictions on destinations, end users, and end use.
+
+6.      TERMINATION
+These Terms and Conditions will continue to apply until terminated by either you or Google as set forth below.  You may terminate these Terms and Conditions at any time by permanently deleting the Application from your mobile device in its entirety.  Your rights automatically and immediately terminate without notice from Google or any Third Party if you fail to comply with any provision of these Terms and Conditions.  In such event, you must immediately delete the Application.
+
+7.      INDEMNITY
+To the maximum extent permitted by law, you agree to defend, indemnify and hold harmless Google, its affiliates and their respective directors, officers, employees and agents from and against any and all claims, actions, suits or proceedings, as well as any and all losses, liabilities, damages, costs and expenses (including reasonable attorneys fees) arising out of or accruing from your use of the Application, including your downloading, installation, or use of the Application, or your violation of these Terms and Conditions.
+
+8.      DISCLAIMER OF WARRANTIES
+A.       You expressly understand and agree that your use of the application is at your sole discretion and risk and that the application is provided “as is” and “as available” without warranty of any kind.
+B.       You are solely responsible for any damage to your mobile device, or other device, or loss of data that results from such use.
+C.        Google further expressly disclaims all warranties and conditions of any kind, whether express or implied, including, but not limited to the implied warranties and conditions of merchantability, fitness for a particular purpose and non-infringement, with respect to the application.
+D.       The application is not intended for use in the operation of nuclear facilities, life support systems, emergency communications, aircraft navigation or communication systems, air traffic control systems, or any other activities in which the failure of the application could lead to death, personal injury, or severe physical or environmental damage.
+
+9.      LIMITATION OF LIABILITY
+You expressly understand and agree that google, its subsidiaries and affiliates, and its licensors are not liable to you under any theory of liability for any direct, indirect, incidental, special consequential or exemplary damages that may be incurred by you through your use of the application, including any loss of data or damage to your mobile device, whether or not google or its representatives have been advised of or should have been aware of the possibility of any such losses arising.
+
+10.  MISCELLANEOUS
+a.       These Terms and Conditions constitute the entire Agreement between you and Google relating to the Application and govern your use of the Application, and completely replace any prior or contemporaneous agreements between you and Google regarding the Application.
+b.       The failure of Google to exercise or enforce any right or provision of these Terms and Conditions does not constitute a waiver of such right or provision, which will still be available to Google.
+c.        If any court of law, having the jurisdiction to decide on this matter, rules that any provision of these Terms and Conditions is invalid, then that provision will be removed from the Terms and Conditions without affecting the rest of the Terms and Conditions.  The remaining provisions of these Terms and Conditions will continue to be valid and enforceable.
+d.       The rights granted in these Terms and Conditions may not be assigned or transferred by either you or Google without the prior written approval of the other party.  Neither you nor Google are permitted to delegate their responsibilities or obligations under these Terms and Conditions without the prior written approval of the other party.
+e.        These Terms and Conditions and your relationship with Google under these Terms and Conditions will be governed by the laws of the State of California without regard to its conflict of laws provisions.  You and Google agree to submit to the exclusive jurisdiction of the courts located within the county of Santa Clara, California to resolve any legal matter arising from these Terms and Conditions.  Notwithstanding this, you agree that Google will still be allowed to apply for injunctive remedies (or an equivalent type of urgent legal relief) in any jurisdiction.
@@ -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>
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Rodrigo Damazio	2eb36aedeb	Releasing version 1.0.20.	2010-11-23 15:18:39 -08:00
Bartlomiej Niechwiej	0e623ebfeb	Fix a memory leak that was observed each time a recording session was stopped.	2010-11-21 23:49:17 -08:00
Rodrigo Damazio	ffb73569e9	Merging Bart's fixes.	2010-11-21 21:11:35 -08:00
Bartlomiej Niechwiej	713cda9455	Addressed Rodrigo's comment.	2010-11-21 21:07:59 -08:00
Bartlomiej Niechwiej	223721cca8	Nullify bineder/checkListener on destroy.	2010-11-21 20:55:44 -08:00
Rodrigo Damazio	e7479c8a93	Fixing periodic task restarting.	2010-11-21 20:45:25 -08:00
Bartlomiej Niechwiej	224fe0069b	Make sure there is only one instance of TrackRecordingService at a time.	2010-11-21 19:33:14 -08:00
Rodrigo Damazio	cb97847392	Addressing comments from a475cd4d33.	2010-11-21 00:44:34 -08:00
Rodrigo Damazio	6a29531467	Second attempt at proper task startup.	2010-11-20 16:21:59 -08:00
Rodrigo Damazio	262e249d2c	Also fixing splitter initialization, just for completeness.	2010-11-20 05:46:38 -08:00
Rodrigo Damazio	77479efaef	Fixing TTS initialization.	2010-11-20 05:43:09 -08:00
Rodrigo Damazio	898863a8d9	Merging Sandor's second head by ignoring it	2010-11-19 18:37:27 -08:00
Sandor Dornbush	05d555f98d	Fix the end track confirmation dialog.	2010-11-19 17:23:27 -08:00
Rodrigo Damazio	868092db10	Fixing intiialization before context is available.	2010-11-19 14:26:11 -08:00
Rodrigo Damazio	7a738c2eca	Moving the end recording method to more reasonable location.	2010-11-18 17:14:56 -08:00
Rodrigo Damazio	b304dbcba6	Fixing wake lock being held for too long in the service.	2010-11-18 17:13:20 -08:00
Rodrigo Damazio	6e28a5daa4	Merging Matthew's fix for issue 137.	2010-11-18 16:41:21 -08:00
Bartlomiej Niechwiej	8f4f9660ed	Addressed Sandor's comments.	2010-11-18 15:42:02 -08:00
Bartlomiej Niechwiej	2d01535651	Fixed a NPE introduced after refactoring dialogManager.	2010-11-17 22:39:50 -08:00
Bartlomiej Niechwiej	e57d4669fc	Revert API key changes.	2010-11-17 22:25:20 -08:00
Bartlomiej Niechwiej	f47c599dea	Merge with 63eb7915dafe329e8f06cc33c56122ee15ea6df7	2010-11-17 22:20:15 -08:00
Bartlomiej Niechwiej	7a693a90f7	Make the app single process only, including the following fixes: 1) Simplify SharedPreferences management 2) Shut down signalManager/splitManager to avoid random crashes 3) Get rid of sharedPreferencesChanged from the service interface All tests pass.	2010-11-17 22:18:50 -08:00
Bartlomiej Niechwiej	9cf51de3f7	Fix a typo in onDestroy.	2010-11-17 20:07:34 -08:00
Matthew Simmons	5089c20cd6	Code review fixes	2010-11-16 11:39:08 -05:00
Bartlomiej Niechwiej	a0da23f86a	Various fixes to shared preferences.	2010-11-15 23:09:18 -08:00
Rodrigo Damazio	44d24b57c6	Making telephony support optional.	2010-11-15 22:04:48 -08:00
Rodrigo Damazio	c143d774d4	Merging Aaron's changes.	2010-11-15 21:50:46 -08:00
Matthew Simmons	9e92240dd0	More self-review	2010-11-15 21:46:19 -05:00
Sandor Dornbush	d2c586b096	Fix StatusAnnouncer thread for initialization and prefs in service.	2010-11-15 18:20:10 -08:00
Matthew Simmons	fbfbb9408a	Self-review	2010-11-15 18:46:23 -05:00
Matthew Simmons	fb56665dec	Rework authorization failure retry. The retry needs to be synchronous with the original runone.	2010-11-15 18:37:42 -05:00
Bartlomiej Niechwiej	5b65c216b6	More tests.	2010-11-12 22:18:38 -08:00
Rodrigo Damazio	9ad98c5970	Merging Sandor's changes	2010-11-12 14:37:04 -08:00
Aaron Brown	cae9d0f2e5	updated MyTracks/AndroidManifest.xml for inclusion of uses-feature	2010-11-12 17:11:56 +10:00
Sandor Dornbush	c0d267c63e	Minor formating fixes.	2010-11-11 21:41:39 -08:00
Sandor Dornbush	70704b0a5e	Move navcontrols icon decleration to xml.	2010-11-11 21:38:24 -08:00
Sandor Dornbush	b135275201	Minor fix for dialog manager.	2010-11-11 16:15:11 -08:00
Bartlomiej Niechwiej	7e1eae6681	Addressed Sandor's comments and added more unit tests and fixed 2 NPEs.	2010-11-11 10:55:15 -08:00
Bartlomiej Niechwiej	30f5d6dc85	Fix two NPEs and add more test coverage.	2010-11-11 00:31:56 -08:00
Sandor Dornbush	a50dd1168b	Fix format error.	2010-11-09 13:57:19 -08:00
Sandor Dornbush	62fa1620aa	Actually add the dialog tests.	2010-11-08 11:31:14 -08:00
Sandor Dornbush	a0d42c8b59	Add basic tests to the DialogManager.	2010-11-08 11:28:39 -08:00
Bartlomiej Niechwiej	a21663da61	Fix a NPE (replace MyTracks.getInstance() with the parent activity).	2010-11-06 23:37:14 -07:00
Bartlomiej Niechwiej	67a0382942	Fixed another bug reported by users (division by zero). The issue was most likely related to a race condition (selectedTrackId can change in the UI thread, while the track is being processed in the handler thread). Simulated slow drawing by adding 50ms, works pretty cool :)	2010-11-06 00:31:52 -07:00
Bartlomiej Niechwiej	f5c2467d01	Fix StringIndexOutOfBoundsException in ChartsExtendedEncoder.getEncodedValue(). Found in user error reports (3rd top issue): java.lang.StringIndexOutOfBoundsException at com.google.android.apps.mytracks.util.ChartsExtendedEncoder.getEncodedValue(ChartsExtendedEncoder.java:45) at com.google.android.apps.mytracks.util.ChartURLGenerator.getChartUrl(ChartURLGenerator.java:162) at com.google.android.apps.mytracks.util.ChartURLGenerator.getChartUrl(ChartURLGenerator.java:60) at com.google.android.apps.mytracks.util.StringUtils.generateTrackDescription(StringUtils.java:366) at com.google.android.apps.mytracks.io.SendToMyMaps.doUpload(SendToMyMaps.java:581) at com.google.android.apps.mytracks.io.SendToMyMaps.access$10(SendToMyMaps.java:538) at com.google.android.apps.mytracks.io.SendToMyMaps$5.run(SendToMyMaps.java:517) at android.os.Handler.handleCallback(Handler.java:587) at android.os.Handler.dispatchMessage(Handler.java:92) at android.os.Looper.loop(Looper.java:123) at android.os.HandlerThread.run(HandlerThread.java:60)	2010-11-05 22:52:42 -07:00
Bartlomiej Niechwiej	a3abcc8094	Provide a workaround for binding to the service once it has been started. It fixes the failing tests (4).	2010-11-05 20:45:06 -07:00
Sandor Dornbush	edf439f301	Merge Bart's bug fixes and tests.	2010-11-05 15:37:20 -07:00
Sandor Dornbush	2245563250	Fix broken build.	2010-11-05 14:51:06 -07:00
Bartlomiej Niechwiej	bca21d5515	Addressed Rodrigo's comments.	2010-11-05 10:11:55 -07:00
Bartlomiej Niechwiej	89cae2e7c9	Fix a regression related refactoring recordingTrackId management. In particular: 1) Add a workaround to {start/end}Recording to update recordingTrackId to trigger a notification 2) Add a bunch of unit tests for MyTracks 3) Clear minor style issues in a few classes	2010-11-04 23:32:31 -07:00
Sandor Dornbush	26c381a4c4	Address Bart's comments and more dialog clean up.	2010-11-04 17:44:08 -07:00
Sandor Dornbush	4bc5aa050c	Add tests for the TempFileCleaner.	2010-11-04 17:07:59 -07:00
Rodrigo Damazio	cd44b0d180	Merging Sandor's changes.	2010-11-03 21:08:50 -02:00
Rodrigo Damazio	59ee91ca5d	Merging my own changes.	2010-11-03 20:59:32 -02:00
Rodrigo Damazio	59165a7033	Ignoring Matthew's second head by no-op merging it.	2010-11-03 20:53:50 -02:00
Rodrigo Damazio	93d242c05f	Merging Matthew's first head.	2010-11-03 20:42:35 -02:00
Rodrigo Damazio	4bbb6591e3	Merging Bart's changes.	2010-11-03 19:59:35 -02:00
Sandor Dornbush	7df8025f6a	Merge with head and address comments.	2010-11-03 12:53:12 -07:00
Bartlomiej Niechwiej	f19c52f40e	Addressed Sandor's comments.	2010-11-02 08:31:21 -07:00
Bartlomiej Niechwiej	b7840779fe	Revert API Key Change.	2010-11-02 08:26:31 -07:00
Rodrigo Damazio	28042a8cc9	Adding tests to voice announcements. If anyone asks, I didn't write this code.	2010-11-02 02:19:43 -02:00
Matthew Simmons	b2907226bf	Code review comments	2010-11-01 15:21:33 -04:00
Matthew Simmons	a2f46821f5	Fix author line	2010-11-01 14:32:19 -04:00
Matthew Simmons	b7385cd4cc	Combine b2f2f9e9e9 and 8774b3663c Allow users to choose the default track name policy. By default, we'll switch to a new, timestamp-based name. If they change the pref, they'll get the old-style 'track n' style.	2010-11-01 13:48:33 -04:00
Matthew Simmons	718c65818c	Allow users to choose the track name policy.	2010-11-01 12:59:56 -04:00
Rodrigo Damazio	91e2293606	Adding proper AndroidMock configuration - requires setting eclipse variables	2010-11-01 05:30:16 -02:00
Rodrigo Damazio	3c4a921f9a	Addressing review suggestions	2010-11-01 05:27:04 -02:00
Rodrigo Damazio	d04b333126	Merging	2010-11-01 02:05:42 -02:00
Rodrigo Damazio	0a4bef4d9a	Fixing concurrent access to the content provider by making it have a single instance in the same process as the service.	2010-10-29 17:35:54 -02:00
Bartlomiej Niechwiej	a0f090a83a	Bug fixing and refactoring: 1) Make sure no one but service changes recordingTrackId (which is owned by it) 2) Cache sharedPreferences 3) Clear recordingTrackId if it doesn't correspond to a valid track or the service is not recording 4) More unit tests	2010-10-28 22:49:01 -07:00
Bartlomiej Niechwiej	dc8ee5943c	Merge with c10bc69662325f00bf166b783cc3ab1b78ccfed9	2010-10-28 20:48:01 -07:00
Bartlomiej Niechwiej	9132c36aa7	Use a test android:apiKey instead of the official one.	2010-10-28 20:47:42 -07:00
Sandor Dornbush	224c0d759f	Minor fixes noticed on first review.	2010-10-28 17:13:59 -07:00
Sandor Dornbush	ffcaca2db1	Refactor a few 100 lines of code out of the main Activity.	2010-10-28 17:08:59 -07:00
Sandor Dornbush	409fc4a43b	Address Bart's comments.	2010-10-28 15:07:01 -07:00
Sandor Dornbush	16968f3f2b	Fix copyright notice.	2010-10-28 14:50:03 -07:00
Sandor Dornbush	e3fd0dce21	Undo changes to the eclipse prefs.	2010-10-28 14:47:00 -07:00
Sandor Dornbush	53b6b6deca	Add tests to ChartValueSeries. Also other minor fixes.	2010-10-28 14:43:31 -07:00
Rodrigo Damazio	26f47a50d0	Fixing issue 34: Not making voice announcements during a phone call	2010-10-27 03:07:17 -02:00
Bartlomiej Niechwiej	3cf77374c4	Fix merge.	2010-10-26 20:19:54 -07:00
Bartlomiej Niechwiej	a1129c3f0f	Merge with c58e4b8519d3ed6959a96192286b83aa1b77f6f3	2010-10-26 20:17:15 -07:00
Bartlomiej Niechwiej	2fe74603a3	Merge with 96ee47b2d8639a0cf62a387f3360640643fbeb0a	2010-10-26 20:14:41 -07:00
Bartlomiej Niechwiej	54d517363d	Merge with e34329d612571554d6424d5941dfad57e35612a0	2010-10-26 19:39:46 -07:00
Bartlomiej Niechwiej	948fe0c0e6	Merge with 68eb8dff3a87698ace057447dff40a07cf673f2e	2010-10-26 19:39:20 -07:00
Bartlomiej Niechwiej	dbd8e6c0e9	Merge with 5ed61c63ba59f4748231ea14bbbc222423d0b08a	2010-10-26 19:38:51 -07:00
Bartlomiej Niechwiej	02b5601933	Remove unnecessary log.	2010-10-26 19:32:24 -07:00
Sandor Dornbush	3ed40608a2	Merging from head.	2010-10-26 14:44:31 -07:00
Bartlomiej Niechwiej	36d7c2dd91	Allow to move the app to SD card (by default goes to internal storage). This is a frequently requested feature (based on market feedback).	2010-10-26 00:33:38 -07:00
Bartlomiej Niechwiej	fa7ef68851	Addressed Sandor's comments.	2010-10-25 22:35:38 -07:00
Matthew Simmons	f84877a4fc	Issue 86: Remove - from the list of disallowed characters for filenames.	2010-10-25 14:59:20 -04:00
Matthew Simmons	261fb62e24	Changed the default new track name from "track %d" to "date time", where "date" is a short, locale-aware version of the track's start date, and "time" is the track's start time.	2010-10-25 14:15:16 -04:00
Bartlomiej Niechwiej	48d8aa4cd8	Introduce an interface to decouple platform specific API from the classes that require it. Also: 1) Put the service into foreground to prevent from being killed by the system 2) Fix a bug the prevented MyTracks from running on pre-Eclair devices	2010-10-24 21:24:11 -07:00
Bartlomiej Niechwiej	95ff0d3db6	Fix a typo in shared preferences and minor cleanup.	2010-10-24 18:55:35 -07:00
Bartlomiej Niechwiej	2dc1d914c0	Several fixes to the service and more test coverage. Notably: 1) Fixed isRecording to not return false if service is down (for instance, it may be being restarted) 2) Added more checks to prevent from invalid starting/stopping (if in already in progress/not started).	2010-10-24 14:16:43 -07:00
Bartlomiej Niechwiej	fc06701009	Fix several bugs and clean up statistics management. 1) Decouple clock from TripStatisticsBuilder. 2) Introduce a new param to constructor to automatically resume at given time 3) Fix various statsbuilder initialization issues in the service (wrong order, missing initialization)	2010-10-24 03:30:58 -07:00
Bartlomiej Niechwiej	ee4f334296	Fixed a NPE under certain circumstances (move initialization to onCreate()).	2010-10-24 03:26:32 -07:00
Bartlomiej Niechwiej	cac2395237	More unit tests for TracksRecordingService and fix a few bugs. Made the service less forgiving rather than silently ignoring invalid state.	2010-10-24 00:48:53 -07:00
Bartlomiej Niechwiej	5afc3f13cf	Minor refactoring: remove dependency on Context and replace it with ContentResolver.	2010-10-23 19:04:57 -07:00
Rodrigo Damazio	9030917c14	Merging Bart's changes.	2010-10-22 15:34:24 -02:00
Bartlomiej Niechwiej	9905def352	Terminate tracker update thread on destroy.	2010-10-22 10:14:36 -07:00
Bartlomiej Niechwiej	a3793aa92b	Minor updates.	2010-10-22 10:00:15 -07:00
Nulled	76c8498956	updated zh-cn translation	2010-10-21 17:51:40 +08:00
Nulled	75bd8ea5a2	Updated zh-cn translation. fixed some errors.	2010-10-15 18:15:43 +08:00
Nulled	50a5e864ac	updated zh-cn translation	2010-10-15 18:04:56 +08:00
Rodrigo Damazio	352fc26f7e	Fixing tests	2010-10-14 23:25:42 -03:00
Rodrigo Damazio	44afa1623e	Making locations be reused when writing tracks.	2010-10-14 21:06:59 -03:00
Rodrigo Damazio	14acafabfc	Getting rid of TrackBuffer.	2010-10-14 20:42:02 -03:00
Rodrigo Damazio	773af58d03	Fixing issue 190 (third step: reordering methods in execution order - no other changes)	2010-10-14 18:44:55 -03:00
Rodrigo Damazio	352b851e9c	Fixing issue 190 (second step: refactoring mymaps uploading)	2010-10-14 18:35:51 -03:00
Rodrigo Damazio	8353a01082	Addressing review suggestions.	2010-10-14 16:41:20 -03:00
Bartlomiej Niechwiej	b70e001206	Addressed Rodrigo's comments.	2010-10-13 21:58:26 -07:00
Rodrigo Damazio	a741bb4d55	Fixing issue 190 (first step: dirty hack)	2010-10-13 22:03:31 -03:00
Rodrigo Damazio	24adee3d54	Addressing review suggestions and adding tests.	2010-10-13 21:53:16 -03:00
Bartlomiej Niechwiej	09203ffb95	Improved test coverage and minor refactoring/improvements.	2010-10-13 12:29:00 -07:00
Bartlomiej Niechwiej	e94338f4c6	Fix a drawing lag during track recording. For a track with ~2,500 points, the average drawign would take ~30-50ms, now it takes about 20ms (21ms if software clipping is enabled). Removed all possible congestion points by introducing a blocking queue. This change includes many fixes, including: 1) Major refactoring and clean up of the overlay, sped up drawing by a factor of 2x 2) Disable software clipping as it was slower by about 5% than w/o clipping and would trigger a bug related to map view spanning 3) Add waypoints synchronization and fixed a bug related to skipping the first wpt 4) Add a simple unit test	2010-10-11 21:55:12 -07:00
Rodrigo Damazio	dd9dd8ee81	Refactoring API level detection.	2010-10-11 22:28:02 -03:00
Rodrigo Damazio	01d6dcac59	Merging Bart's Polish fix.	2010-10-07 21:59:11 -03:00
Rodrigo Damazio	ad0ee6b0d6	Merging Bart's Polish fix.	2010-10-07 21:58:07 -03:00
Rodrigo Damazio	769c8c228e	Added tag v1.0.19 for changeset b096086934d6	2010-10-07 21:21:52 -03:00
Rodrigo Damazio	50fcd67085	Releasing version 1.0.19 (bugfix release)	2010-10-07 21:21:23 -03:00
Sandor Dornbush	52d03e6b7d	Address Rodrigo's comments.	2010-10-07 16:28:42 -07:00
Sandor Dornbush	b949cd0039	Really fix bug.	2010-10-07 12:39:05 -07:00
Sandor Dornbush	e527170315	Fix recording error.	2010-10-07 12:01:32 -07:00
Sandor Dornbush	ec7d210c36	Fix recording error.	2010-10-07 11:51:54 -07:00
Bartlomiej Niechwiej	74a4089464	Fix incorrect Polish translation related to delete track(s)/marker confirmation dialog (Issue 176).	2010-10-07 11:36:39 -07:00
Rodrigo Damazio	fa9e14f574	Added tag v1.0.18 for changeset 7c67cd917be3	2010-10-05 17:12:20 -03:00
Rodrigo Damazio	cdbeefcd16	Releasing version 1.0.18	2010-10-05 17:11:52 -03:00
Rodrigo Damazio	ffdd5f4091	Merging Bart's changes	2010-10-05 14:48:43 -03:00
Bartlomiej Niechwiej	bb60525780	Rename intent name to be uppercase.	2010-10-05 10:39:07 -07:00
Bartlomiej Niechwiej	82634af649	Minor refactoring.	2010-10-05 09:47:15 -07:00
Bartlomiej Niechwiej	3643ed9f13	Add missing Polish translations.	2010-10-04 23:07:38 -07:00
Bartlomiej Niechwiej	fac59ab705	Partially fix a nasty bug related to losing a tracking session on service crash.	2010-10-04 21:53:34 -07:00
Bartlomiej Niechwiej	1e343b0d12	Limit the maximum number of auto-resume retry attempts to 3.	2010-10-04 21:17:56 -07:00
Bartlomiej Niechwiej	34bb467b97	Merge with 25704964a526fcfe09919af8f29c1e526b5409ec	2010-10-04 16:34:38 -07:00
Sandor Dornbush	b092525c10	More swedish fixes.	2010-10-04 16:33:25 -07:00
Bartlomiej Niechwiej	256dac3a82	Moved showNotification() outside if clause.	2010-10-03 23:34:19 -07:00
Bartlomiej Niechwiej	dfe947f54d	Fixed an exception in MyTracks (added isBound), moved resumeState from onStart to onCreate in TrackRecordingService and some minor refactoring.	2010-10-03 23:28:12 -07:00
Andreas Bockert	ce09407816	Fixed a number incorrect translation in Swedish language.	2010-10-01 22:33:16 +02:00
Bartlomiej Niechwiej	beee6af79d	Apply review feedback.	2010-09-30 23:46:47 -07:00
Bartlomiej Niechwiej	c282562867	Introduce getLastModified() in Tracks class and fixe a NullPointerException in service if null intent is passed by the system.	2010-09-30 21:54:07 -07:00
Rodrigo Damazio	2aed9b3a33	Fixing track writer test after memory changes	2010-09-29 18:49:13 -03:00
Rodrigo Damazio	210910f21e	Merging aggregated statistics change	2010-09-29 18:46:45 -03:00
Bartlomiej Niechwiej	1d666318ae	Fix a bug in maybeResumeTrack. Still not sure if it works correctly (need to verify on real device).	2010-09-29 00:33:28 -07:00
Bartlomiej Niechwiej	4df6095089	Implement automatic restart of MyTracks on phone reboot. In addition fix the following issues/add functionality: 0) Introduce MyTracksReceiver for listening on broadcast messages 1) Remove unnecessary call to VerifyChecker to avoid 403. 2) Clean up TrackRecordingService by adding private methods for common functionality 3) Fix a bug related to not canceling a timer after service was stopped 4) Add a new preference item to control behavior of new functionality 5) Add a unit test for the service (still need to figure out one issue with mocking content resolver).	2010-09-28 22:46:24 -07:00
Rodrigo Damazio	d4edcce224	Uncommenting overlooked XML.	2010-09-27 21:42:59 -03:00
Rodrigo Damazio	d7c6761841	Addressing comments I originally made on Sandor's change.	2010-09-27 21:02:52 -03:00
Rodrigo Damazio	5733224f8d	Merging Sandor's memory footprint improvement	2010-09-27 17:41:34 -03:00
Rodrigo Damazio	22fd5042bc	Merging Sandor's memory footprint improvement	2010-09-27 17:37:20 -03:00
Rodrigo Damazio	44a6f2d448	Further improving/fixing drawing, and adding a bounding box for debugging.	2010-09-27 16:14:04 -03:00
Rodrigo Damazio	cd9c17f9b3	Fixing leftover from another commit - commenting out testing method.	2010-09-27 16:11:17 -03:00
Rodrigo Damazio	dc07bcf0fa	Fixing call to HandlerThread.quit() which only exists in API level 5+.	2010-09-27 14:54:36 -03:00
Rodrigo Damazio	248b8fb4fd	Fixing bad resource in preferences (only used in 1.5).	2010-09-27 14:53:30 -03:00
Sandor Dornbush	35182a1483	Merge changes.	2010-09-23 14:30:44 -07:00
Sandor Dornbush	21b0a517a9	Merged Rodrigo's changes.	2010-09-23 11:07:31 -07:00
Sandor Dornbush	19a770445e	Submit my changes before merging.	2010-09-23 11:02:45 -07:00
Rodrigo Damazio	c6512f1376	Preparing to further isolate non-UI code from map drawing.	2010-09-22 22:10:36 -03:00
Rodrigo Damazio	2cb3963138	Refactoring track drawing	2010-09-22 22:04:07 -03:00
Sandor Dornbush	d05c394c68	Trying to track down the missing end of track bug.	2010-09-21 15:10:56 -07:00
Sandor Dornbush	797de31960	Merging fixes.	2010-09-14 10:52:55 -07:00
Sandor Dornbush	872d2d4337	Correctly take preference as a long and stop dividing bounds by E6.	2010-09-08 17:36:58 -07:00
FNelson	b84da40365	Merge with 28a6c6c0e8f12e489fa501609be4b564eb822f55 (Merge to Head)	2010-09-02 12:23:32 +01:00
FNelson	236bcba2bd	Changing retrieveAllTracks to getAllTracks	2010-08-12 14:31:03 +01:00
FNelson	0347877290	Tidy up to adhere to style guidlines	2010-08-05 12:51:46 +01:00
FNelson	b464526d5e	Aggregated stats in first working state.	2010-08-04 11:58:43 +01:00
FNelson	0ccd05e605	First stab at aggregated stats. Still needs work. Check in to work on home computer	2010-07-30 15:04:35 +01:00
FNelson	916e4586c5	First HG commit test.	2010-07-28 10:38:26 +01:00