merge heads

2011-12-16 16:16:08 -08:00 · 2011-12-16 16:12:50 -08:00
503 changed files with 36539 additions and 18076 deletions
@@ -2,5 +2,10 @@ syntax:glob

 */bin
 */gen/**
+*/proguard/**
 .metadata
-MyTracksTest/annotations.log
+MyTracksTest/AnnotationProcessor.log
+**/*.pyc
+**/*.pyo
+syntax: glob
+MyTracksTest/hs_err_pid*.log
@@ -2,9 +2,20 @@
 <classpath>
 	<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
 	<classpathentry kind="lib" path="libs/googleloginclient-helper.jar"/>
-	<classpathentry kind="lib" path="libs/google-common.jar"/>
-	<classpathentry kind="lib" path="libs/accounts.jar"/>
+	<classpathentry exported="true" kind="lib" path="libs/google-common.jar"/>
+	<classpathentry kind="lib" path="libs/libGoogleAnalytics.jar"/>
+	<classpathentry kind="lib" path="libs/google-api-client/commons-codec-1.3.jar"/>
+	<classpathentry exported="true" kind="lib" path="libs/google-api-client/commons-logging-1.1.1.jar"/>
+	<classpathentry kind="lib" path="libs/google-api-client/google-api-client-1.5.0-beta.jar"/>
+	<classpathentry kind="lib" path="libs/google-api-client/google-http-client-1.5.0-beta.jar"/>
+	<classpathentry kind="lib" path="libs/google-api-client/google-oauth-client-1.5.0-beta.jar"/>
+	<classpathentry kind="lib" path="libs/google-api-client/gson-1.6.jar"/>
+	<classpathentry kind="lib" path="libs/google-api-client/guava-r09.jar"/>
+	<classpathentry kind="lib" path="libs/google-api-client/jackson-core-asl-1.6.7.jar"/>
+	<classpathentry kind="lib" path="libs/google-api-client/jsr305-1.3.9.jar"/>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="src" path="gen"/>
-	<classpathentry kind="output" path="bin"/>
+	<classpathentry exported="true" kind="lib" path="/MyTracksLib/libs/protobuf-java-2.3.0-lite.jar"/>
+	<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
+	<classpathentry kind="output" path="bin/classes"/>
 </classpath>
@@ -3,6 +3,7 @@
 	<name>MyTracks</name>
 	<comment></comment>
 	<projects>
+		<project>MyTracksLib</project>
 	</projects>
 	<buildSpec>
 		<buildCommand>
@@ -1,4 +1,4 @@
-#Wed Sep 29 18:44:16 BRT 2010
+#Fri Oct 21 20:06:28 BRST 2011
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
 org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
@@ -7,6 +7,351 @@ 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
@@ -0,0 +1,61 @@
+#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,11 +1,27 @@
 <?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="21"
-          android:versionName="1.0.20">
+          android:versionCode="35"
+          android:versionName="1.1.12">
  <application android:icon="@drawable/arrow_icon"
-               android:label="@string/app_name"
+               android:label="@string/my_tracks_app_name"
+               android:name="com.google.android.apps.mytracks.MyTracksApplication"
               android:backupAgent="com.google.android.apps.mytracks.io.backup.MyTracksBackupAgent">
    <uses-library android:name="com.google.android.maps" />

@@ -13,10 +29,12 @@
               android:value="AEdPqrEAAAAIi-_QiwoRSc9_bAC9cmuNXTQyU8ajJmGtKdhskQ" />

    <provider android:name="com.google.android.apps.mytracks.content.MyTracksProvider"
-              android:authorities="com.google.android.maps.mytracks" />
+              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" />

    <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" />
@@ -26,6 +44,112 @@
        <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" />
@@ -34,67 +158,58 @@
      </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"/>
+              android:label="@string/welcome_title"
+              android:exported="false" />

    <service android:name="com.google.android.apps.mytracks.services.TrackRecordingService"
-             android:label="Track Recording Service"
+             android:label="@string/my_tracks_recording_service"
             android:icon="@drawable/arrow_320"
             android:enabled="true"
-             android:exported="true" />
+             android:exported="true"
+             android:permission="com.google.android.apps.mytracks.WRITE_TRACK_DATA" />

-    <receiver android:name="com.google.android.apps.mytracks.MyTracksReceiver">
+    <service android:name="com.google.android.apps.mytracks.services.ControlRecordingService"
+             android:exported="false" />
+             
+    <receiver android:name="com.google.android.apps.mytracks.BootReceiver">
      <intent-filter>
        <action android:name="android.intent.action.BOOT_COMPLETED" />
-	  </intent-filter>
+      </intent-filter>
+    </receiver>
+
+    <receiver android:name="com.google.android.apps.mytracks.widgets.TrackWidgetProvider">
+      <intent-filter>
+        <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
+        <action android:name="com.google.android.apps.mytracks.TRACK_STARTED" />
+        <action android:name="com.google.android.apps.mytracks.TRACK_STOPPED" />
+      </intent-filter>
+      <meta-data android:name="android.appwidget.provider"
+                 android:resource="@xml/track_widget_info" />
    </receiver>
  </application>

  <!-- Permissions to initialize service -->
  <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
-  
+
  <!-- Permissions for recording tracks and showing maps -->
  <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
  <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
+  <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
  <uses-permission android:name="android.permission.INTERNET" />
  <uses-permission android:name="android.permission.WAKE_LOCK" />
+  <uses-permission android:name="android.permission.BLUETOOTH" />
+  <uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />
+
+  <uses-permission android:name="com.dsi.ant.permission.ANT" />
+  <uses-permission android:name="com.dsi.ant.permission.ANT_ADMIN" />

  <!-- Permissions for uploading tracks -->
  <uses-permission android:name="android.permission.GET_ACCOUNTS" />
  <uses-permission android:name="android.permission.MANAGE_ACCOUNTS" />
  <uses-permission android:name="android.permission.USE_CREDENTIALS" />
  <uses-permission android:name="com.google.android.googleapps.permission.GOOGLE_AUTH" />
+  <uses-permission android:name="com.google.android.googleapps.permission.GOOGLE_AUTH.fusiontables" />
  <uses-permission android:name="com.google.android.googleapps.permission.GOOGLE_AUTH.local" />
  <uses-permission android:name="com.google.android.googleapps.permission.GOOGLE_AUTH.wise" />
  <uses-permission android:name="com.google.android.googleapps.permission.GOOGLE_AUTH.writely" />
@@ -102,22 +217,56 @@

  <!-- 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" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <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.debug"/>
 <listEntry value="org.eclipse.debug.ui.launchGroup.run"/>
+<listEntry value="org.eclipse.debug.ui.launchGroup.debug"/>
 </listAttribute>
 <booleanAttribute key="org.eclipse.jdt.launching.ALLOW_TERMINATE" value="true"/>
 <stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="MyTracks"/>
@@ -1,62 +0,0 @@
-<!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>
@@ -0,0 +1,22 @@
+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/.
@@ -0,0 +1,75 @@
+-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
+
@@ -1,13 +1,15 @@
 # This file is automatically generated by Android Tools.
 # Do not modify this file -- YOUR CHANGES WILL BE ERASED!
-# 
+#
 # This file must be checked in Version Control Systems.
-# 
+#
 # To customize properties used by the Ant build system use,
-# "build.properties", and override values to adapt the script to your
+# "ant.properties", and override values to adapt the script to your
 # project structure.

 # Indicates whether an apk should be generated for each density.
 split.density=false
+proguard.config=proguard.cfg
 # Project target.
-target=Google Inc.:Google APIs:8
+target=Google Inc.:Google APIs:14
+android.library.reference.1=../MyTracksLib
@@ -14,114 +14,90 @@ 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.
 -->
-<TableLayout
+<ScrollView
  xmlns:android="http://schemas.android.com/apk/res/android"
  android:layout_height="wrap_content"
-  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_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_height="wrap_content"
        android:layout_width="wrap_content"
-        android:text="@string/app_name"
-        android:textSize="30sp" />
+        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">
      <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: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">
+        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">
      <TextView
-        android:layout_height="wrap_content"
-        android:layout_width="wrap_content"
-        android:text="@string/about_dylan"
-        android:textSize="20sp" />
+        android:text="@string/about_version"
+        style="@style/AboutTextView.Column0"/>
      <TextView
-        android:layout_height="wrap_content"
-        android:layout_width="wrap_content"
-        android:text="@string/about_leif"
-        android:textSize="20sp" />
+        android:id="@+id/about_version"
+        style="@style/AboutTextView"/>
+    </TableRow>
+    <TableRow style="@style/AboutTableRow">
      <TextView
-        android:layout_height="wrap_content"
-        android:layout_width="wrap_content"
-        android:text="@string/about_rdamazio"
-        android:textSize="20sp" />
+        android:text="@string/about_support"
+        style="@style/AboutTextView.Column0"/>
      <TextView
-        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>
+        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>
@@ -15,119 +15,135 @@ 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:layout_width="fill_parent"
+    android:background="@drawable/list_bar"
    android:layout_height="wrap_content"
-    android:background="@drawable/list_bar">
+    android:layout_width="fill_parent">
    <TextView
-      android:layout_width="fill_parent"
      android:layout_height="wrap_content"
-      android:text="@string/chart_settings"
-      android:textSize="20dip"
+      android:layout_marginLeft="10dp"
+      android:layout_width="fill_parent"
+      android:text="@string/menu_chart_view_chart_settings"
      android:textColor="#fff"
-      android:layout_marginLeft="10dip"/>
+      android:textSize="20sp"/>
  </LinearLayout>
  <ScrollView
-    android:layout_width="fill_parent"
-    android:layout_height="wrap_content"
-    android:layout_weight="1">
+    android:layout_height="0dp"
+    android:layout_weight="1"
+    android:layout_width="fill_parent">
    <TableLayout
-      android:layout_width="fill_parent"
      android:layout_height="wrap_content"
-      android:stretchColumns="1"
-      android:layout_marginTop="5dip"
-      android:layout_marginLeft="5dip">
+      android:layout_marginLeft="5dp"
+      android:layout_marginTop="5dp"
+      android:layout_width="fill_parent"
+      android:stretchColumns="1">
      <TableRow>
        <LinearLayout
-          android:layout_width="fill_parent"
          android:layout_height="wrap_content"
-          android:orientation="vertical"
-          android:layout_marginLeft="10dip">
+          android:layout_marginLeft="10dp"
+          android:layout_width="fill_parent"
+          android:orientation="vertical">
          <LinearLayout
-            android:layout_width="fill_parent"
            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: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:orientation="horizontal">
+            <ImageView
              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_width="wrap_content"
+              android:src="@drawable/x_axis"/>
+            <TextView
              android:layout_height="wrap_content"
-              android:text="@string/by_time"/>
+              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: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:layout_width="fill_parent"
+              android:text="@string/chart_settings_by_time"/>
          </RadioGroup>
        </LinearLayout>
      </TableRow>
      <TableRow>
        <LinearLayout
-          android:layout_width="fill_parent"
          android:layout_height="wrap_content"
-          android:orientation="vertical"
-          android:layout_marginLeft="10dip">
+          android:layout_marginLeft="10dp"
+          android:layout_width="fill_parent"
+          android:orientation="vertical">
          <LinearLayout
-            android:layout_width="fill_parent"
            android:layout_height="wrap_content"
+            android:layout_width="fill_parent"
            android:orientation="horizontal">
-            <ImageView android:src="@drawable/y_axis"
-              android:layout_width="wrap_content"
-              android:layout_height="wrap_content"/>
-            <TextView
-              android:layout_width="fill_parent"
+            <ImageView
              android:layout_height="wrap_content"
-              android:text="@string/y_axis"
-              android:textSize="20dip" />
+              android:layout_width="wrap_content"
+              android:src="@drawable/y_axis"/>
+            <TextView
+              android:layout_height="wrap_content"
+              android:layout_width="fill_parent"
+              android:text="@string/chart_settings_y_axis"
+              android:textSize="20sp" />
          </LinearLayout>
-          <CheckBox android:id="@+id/chart_settings_elevation"
+          <CheckBox
+            android:id="@+id/chart_settings_elevation"
            android:checked="true"
-            android:layout_width="fill_parent"
            android:layout_height="wrap_content"
-            android:text="@string/elevation"/>
-          <CheckBox android:id="@+id/chart_settings_speed"
+            android:layout_width="fill_parent"
+            android:text="@string/stat_elevation"/>
+          <CheckBox
+            android:id="@+id/chart_settings_speed"
            android:checked="true"
-            android:layout_width="fill_parent"
            android:layout_height="wrap_content"
-            android:text="@string/speed"/>
+            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"/>
        </LinearLayout>
      </TableRow>
    </TableLayout>
  </ScrollView>
-  <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"
+  <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"
      android:layout_gravity="right"
-      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"/>
+      android:text="@string/generic_cancel"
+      style="@style/Button"/>
+    <LinearLayout style="@style/ButtonSpacer"/>
  </LinearLayout>
 </LinearLayout>
@@ -31,7 +31,7 @@ limitations under the License.
      android:layout_height="wrap_content"
      android:textSize="16dip"
      android:textColor="#fff"
-      android:text="@string/select_map_message"
+      android:text="@string/my_maps_list_pick_map"
      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/mapslist_no_maps_available"
+      android:text="@string/my_maps_list_no_maps"
      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/maps_list_failed"
+    android:text="@string/my_maps_list_error"
    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/maps_list_loading"/>
+          android:text="@string/my_maps_list_loading"/>
        <TextView
          android:layout_width="wrap_content"
          android:layout_height="wrap_content"
@@ -30,13 +30,15 @@ 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_centerHorizontal="true"
+      android:layout_alignParentRight="true"/>
  </RelativeLayout>
  <LinearLayout android:id="@+id/elevation_busypane"
    android:orientation="vertical"
@@ -1,88 +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: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>
@@ -41,7 +41,7 @@ limitations under the License.
      android:layout_height="wrap_content"
      android:textSize="16dip"
      android:textColor="#fff"
-      android:text="@string/wait_for_fix"
+      android:text="@string/gps_wait_for_fix"
      android:layout_weight="0"/>
    </LinearLayout>
    <LinearLayout android:id="@+id/busypane"
@@ -32,35 +32,27 @@ limitations under the License.
      android:layout_height="wrap_content"
      android:textSize="16dip"
      android:textColor="#fff"
-      android:text="@string/tracklist_pick_one"
+      android:text="@string/track_list_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
-    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"/>
+  <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"/>
    <Button android:id="@+id/tracklist_btn_export_all"
-      android:layout_width="wrap_content"
-      android:layout_height="48dip"
-      android:layout_gravity="left|top"
-      android:text="@string/tracklist_btn_export_all"
-      android:textSize="14dip"/>
+      android:layout_gravity="center_horizontal"
+      android:text="@string/track_list_export_all"
+      style="@style/Button"/>
    <Button android:id="@+id/tracklist_btn_delete_all"
-      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>
+      android:layout_gravity="right"
+      android:text="@string/track_list_delete_all"
+      style="@style/Button"/>
+    <LinearLayout style="@style/ButtonSpacer"/>
+  </LinearLayout>
 </LinearLayout>
@@ -15,115 +15,124 @@ 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="fill_parent"
  android:layout_height="fill_parent"
+  android:layout_width="fill_parent"
  android:orientation="vertical">
  <LinearLayout
-    android:layout_width="fill_parent"
+    android:background="@drawable/list_bar"
    android:layout_height="wrap_content"
-    android:background="@drawable/list_bar">
+    android:layout_width="fill_parent">
    <TextView
-      android:layout_width="fill_parent"
      android:layout_height="wrap_content"
-      android:text="@string/sendtogoogle_title"
-      android:textSize="20dip"
+      android:layout_marginLeft="10dip"
+      android:layout_width="fill_parent"
+      android:text="@string/send_google_title"
      android:textColor="#fff"
-      android:layout_marginLeft="10dip"/>
+      android:textSize="20dip"/>
  </LinearLayout>
-  <ScrollView android:id="@+id/sendtogoogle_scrollview"
-    android:layout_width="fill_parent"
+  <ScrollView
    android:layout_height="0dip"
-    android:layout_weight="1">
+    android:layout_marginBottom="5dip"
+    android:layout_marginLeft="5dip"
+    android:layout_marginTop="5dip"
+    android:layout_weight="1"
+    android:layout_width="fill_parent">
    <TableLayout
-      android:layout_width="fill_parent"
      android:layout_height="wrap_content"
-      android:stretchColumns="1"
-      android:layout_marginTop="5dip"
-      android:layout_marginLeft="5dip">
+      android:layout_width="fill_parent"
+      android:stretchColumns="1">
+      
+      <!-- Google My Maps -->
      <TableRow>
-        <ImageView android:src="@drawable/mymaps_icon"
-          android:layout_width="wrap_content"
-          android:layout_height="wrap_content"/>
-        <LinearLayout
-          android:layout_width="fill_parent"
+        <ImageView
          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:layout_width="wrap_content"
+          android:src="@drawable/mymaps_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_my_maps"
            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_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_create_new_map"/>
-            <RadioButton android:id="@+id/sendtogoogle_pick_existing_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_pick_existing_map"/>
+              android:layout_width="fill_parent"
+              android:text="@string/send_google_existing_map"/>
          </RadioGroup>
        </LinearLayout>
      </TableRow>
+
+      <!-- Google Fusion Tables -->
      <TableRow>
-        <ImageView android:src="@drawable/googledocs_icon"
-          android:layout_width="wrap_content"
-          android:layout_height="wrap_content"/>
-        <LinearLayout
-          android:layout_width="fill_parent"
+        <ImageView
          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: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_fusion_tables"
            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: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: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>
+            android:layout_width="fill_parent"
+            android:text="@string/send_google_docs"
+            android:textSize="18dip"/>
        </LinearLayout>
      </TableRow>
    </TableLayout>
  </ScrollView>
-  <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"
+  <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"
      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/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"/>
+      android:text="@string/generic_cancel"
+      style="@style/Button"/>
+    <LinearLayout style="@style/ButtonSpacer"/>
  </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/waypointdetails_name"
+      <TextView android:text="@string/marker_detail_marker_name"
        android:layout_width="fill_parent"
        android:layout_height="wrap_content"/>
      <LinearLayout
@@ -50,7 +50,9 @@ limitations under the License.
         android:singleLine="true"
         android:autoText="true"
         android:capitalize="words"
-         android:selectAllOnFocus="true"/>
+         android:selectAllOnFocus="true"
+         android:hint="@string/marker_detail_marker_name"
+         android:imeOptions="actionNext"/>
      </LinearLayout>
      <LinearLayout android:id="@+id/waypointdetails_description_layout"
        android:orientation="vertical"
@@ -59,14 +61,16 @@ limitations under the License.
        android:visibility="visible"
        android:layout_weight="1">
        <TextView android:id="@+id/waypointdetails_category_label"
-          android:text="@string/waypointdetails_category"
+          android:text="@string/marker_detail_marker_type"
          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"/>
-        <TextView android:text="@string/waypointdetails_description"
+          android:singleLine="true"
+          android:hint="@string/marker_detail_marker_type_hint"
+          android:imeOptions="actionNext"/>
+        <TextView android:text="@string/marker_detail_marker_description"
          android:layout_width="fill_parent"
          android:layout_height="wrap_content"/>
        <EditText android:id="@+id/waypointdetails_description"
@@ -79,7 +83,9 @@ limitations under the License.
          android:minLines="5"
          android:maxLines="50"
          android:gravity="top"
-          android:layout_weight="1"/>
+          android:layout_weight="1"
+          android:hint="@string/marker_detail_marker_description"
+          android:imeOptions="actionDone"/>
      </LinearLayout>

      <TableLayout android:id="@+id/waypoint_stats"
@@ -95,12 +101,12 @@ limitations under the License.
            android:id="@+id/total_distance_label"
            android:layout_column="1"
            android:layout_span="3"
-            android:text="@string/total_distance_label" />
+            android:text="@string/stat_total_distance" />
          <TextView
            android:id="@+id/max_speed_label"
            android:layout_column="4"
            android:layout_span="2"
-            android:text="@string/max_speed_label" />
+            android:text="@string/stat_max_speed" />
        </TableRow>
        <TableRow
          android:background="@color/stat_label_background">
@@ -110,7 +116,7 @@ limitations under the License.
            android:layout_column="1"
            android:layout_marginBottom="-9dip"
            android:layout_marginTop="-9dip"
-            android:text="@string/unknown"
+            android:text="@string/value_unknown"
            android:textColor="@color/stat_label_text"
            android:textSize="40sp" />
          <TextView
@@ -119,7 +125,7 @@ limitations under the License.
            android:layout_column="2"
            android:layout_marginBottom="-9dip"
            android:layout_marginTop="-9dip"
-            android:text="@string/mile"
+            android:text="@string/unit_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
@@ -139,7 +145,7 @@ limitations under the License.
            android:layout_column="4"
            android:layout_marginBottom="-9dip"
            android:layout_marginTop="-9dip"
-            android:text="@string/unknown"
+            android:text="@string/value_unknown"
            android:textColor="@color/stat_label_text"
            android:textSize="40sp" />
          <LinearLayout
@@ -177,12 +183,12 @@ limitations under the License.
            android:id="@+id/track_time_label"
            android:layout_column="1"
            android:layout_span="3"
-            android:text="@string/total_time_label" />
+            android:text="@string/stat_total_time" />
          <TextView
            android:id="@+id/average_speed_label"
            android:layout_column="4"
            android:layout_span="2"
-            android:text="@string/average_speed_label" />
+            android:text="@string/stat_average_speed" />
        </TableRow>
        <TableRow
          android:background="@color/stat_label_background">
@@ -195,7 +201,7 @@ limitations under the License.
            android:layout_marginTop="-9dip"
            android:layout_span="2"
            android:layout_width="fill_parent"
-            android:text="@string/unknown"
+            android:text="@string/value_unknown"
            android:textColor="@color/stat_label_text"
            android:textSize="40sp" />
          <TextView
@@ -211,7 +217,7 @@ limitations under the License.
            android:layout_column="4"
            android:layout_marginBottom="-9dip"
            android:layout_marginTop="-9dip"
-            android:text="@string/unknown"
+            android:text="@string/value_unknown"
            android:textColor="@color/stat_label_text"
            android:textSize="40sp" />
          <LinearLayout
@@ -249,12 +255,12 @@ limitations under the License.
            android:id="@+id/moving_time_label"
            android:layout_column="1"
            android:layout_span="3"
-            android:text="@string/moving_time_label" />
+            android:text="@string/stat_moving_time" />
          <TextView
            android:id="@+id/average_moving_speed_label"
            android:layout_column="4"
            android:layout_span="2"
-            android:text="@string/average_moving_speed_label" />
+            android:text="@string/stat_average_moving_speed" />
        </TableRow>
        <TableRow
          android:background="@color/stat_label_background">
@@ -267,7 +273,7 @@ limitations under the License.
            android:layout_marginTop="-9dip"
            android:layout_width="fill_parent"
            android:layout_span="2"
-            android:text="@string/unknown"
+            android:text="@string/value_unknown"
            android:textColor="@color/stat_label_text"
            android:textSize="40sp" />
          <TextView
@@ -283,7 +289,7 @@ limitations under the License.
            android:layout_column="4"
            android:layout_marginBottom="-9dip"
            android:layout_marginTop="-9dip"
-            android:text="@string/unknown"
+            android:text="@string/value_unknown"
            android:textColor="@color/stat_label_text"
            android:textSize="40sp" />
          <LinearLayout
@@ -321,12 +327,12 @@ limitations under the License.
            android:id="@+id/elevation_label"
            android:layout_column="1"
            android:layout_span="3"
-            android:text="@string/elevation_label" />
+            android:text="@string/stat_elevation" />
          <TextView
            android:id="@+id/elevation_gain_label"
            android:layout_column="4"
            android:layout_span="2"
-            android:text="@string/elevation_gain_label" />
+            android:text="@string/stat_elevation_gain" />
        </TableRow>
        <TableRow
          android:background="@color/stat_label_background">
@@ -336,7 +342,7 @@ limitations under the License.
            android:layout_column="1"
            android:layout_marginBottom="-9dip"
            android:layout_marginTop="-9dip"
-            android:text="@string/unknown"
+            android:text="@string/value_unknown"
            android:textColor="@color/stat_label_text"
            android:textSize="40sp" />
          <TextView
@@ -345,7 +351,7 @@ limitations under the License.
            android:layout_column="2"
            android:layout_marginBottom="-9dip"
            android:layout_marginTop="-9dip"
-            android:text="@string/feet"
+            android:text="@string/unit_feet"
            android:textColor="@color/stat_label_text"/>
          <TextView
            android:background="@color/black"
@@ -360,7 +366,7 @@ limitations under the License.
            android:layout_column="4"
            android:layout_marginBottom="-9dip"
            android:layout_marginTop="-9dip"
-            android:text="@string/unknown"
+            android:text="@string/value_unknown"
            android:textColor="@color/stat_label_text"
            android:textSize="40sp" />
          <TextView
@@ -369,7 +375,7 @@ limitations under the License.
            android:layout_column="5"
            android:layout_marginBottom="-9dip"
            android:layout_marginTop="-9dip"
-            android:text="@string/feet"
+            android:text="@string/unit_feet"
            android:textColor="@color/stat_label_text" />
        </TableRow>

@@ -379,12 +385,12 @@ limitations under the License.
            android:id="@+id/min_elevation_label"
            android:layout_column="1"
            android:layout_span="3"
-            android:text="@string/min_elevation_label" />
+            android:text="@string/stat_min_elevation" />
          <TextView
            android:id="@+id/max_elevation_label"
            android:layout_column="4"
            android:layout_span="3"
-            android:text="@string/max_elevation_label" />
+            android:text="@string/stat_max_elevation" />
        </TableRow>
        <TableRow
          android:background="@color/stat_label_background">
@@ -394,7 +400,7 @@ limitations under the License.
            android:layout_column="1"
            android:layout_marginBottom="-9dip"
            android:layout_marginTop="-9dip"
-            android:text="@string/unknown"
+            android:text="@string/value_unknown"
            android:textColor="@color/stat_label_text"
            android:textSize="40sp" />
          <TextView
@@ -403,7 +409,7 @@ limitations under the License.
            android:layout_column="2"
            android:layout_marginBottom="-9dip"
            android:layout_marginTop="-9dip"
-            android:text="@string/feet"
+            android:text="@string/unit_feet"
            android:textColor="@color/stat_label_text" />
          <TextView
            android:background="@color/black"
@@ -418,7 +424,7 @@ limitations under the License.
            android:layout_column="4"
            android:layout_marginBottom="-9dip"
            android:layout_marginTop="-9dip"
-            android:text="@string/unknown"
+            android:text="@string/value_unknown"
            android:textColor="@color/stat_label_text"
            android:textSize="40sp" />
          <TextView
@@ -427,7 +433,7 @@ limitations under the License.
            android:layout_column="5"
            android:layout_marginBottom="-9dip"
            android:layout_marginTop="-9dip"
-            android:text="@string/feet"
+            android:text="@string/unit_feet"
            android:textColor="@color/stat_label_text" />
        </TableRow>

@@ -437,12 +443,12 @@ limitations under the License.
            android:id="@+id/min_grade_label"
            android:layout_column="1"
            android:layout_span="3"
-            android:text="@string/min_grade_label" />
+            android:text="@string/stat_min_grade" />
          <TextView
            android:id="@+id/max_grade_label"
            android:layout_column="4"
            android:layout_span="2"
-            android:text="@string/max_grade_label" />
+            android:text="@string/stat_max_grade" />
        </TableRow>
        <TableRow
          android:background="@color/stat_label_background">
@@ -455,7 +461,7 @@ limitations under the License.
            android:layout_marginTop="-9dip"
            android:layout_width="fill_parent"
            android:layout_span="2"
-            android:text="@string/unknown"
+            android:text="@string/value_unknown"
            android:textColor="@color/stat_label_text"
            android:textSize="40sp" />
          <TextView
@@ -474,36 +480,23 @@ limitations under the License.
            android:layout_marginTop="-9dip"
            android:layout_width="fill_parent"
            android:layout_span="2"
-            android:text="@string/unknown"
+            android:text="@string/value_unknown"
            android:textColor="@color/stat_label_text"
            android:textSize="40sp" />
        </TableRow>
      </TableLayout>
    </LinearLayout>
  </ScrollView>
-
-  <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/cancel"
-      android:textSize="14dip"/>
-    <TextView
-      android:layout_width="0dip"
-      android:layout_height="wrap_content"
-      android:layout_weight="1"/>
+  <LinearLayout style="@style/ButtonLayout">
+    <LinearLayout style="@style/ButtonSpacer"/>
    <Button android:id="@+id/waypointdetails_save"
-      android:layout_width="wrap_content"
-      android:layout_height="48dip"
+      android:layout_gravity="left"
+      android:text="@string/generic_save"
+      style="@style/Button"/>
+    <Button android:id="@+id/waypointdetails_cancel"
      android:layout_gravity="right"
-      android:text="@string/save"
-      android:textSize="14dip"/>
+      android:text="@string/generic_cancel"
+      style="@style/Button"/>
+    <LinearLayout style="@style/ButtonSpacer"/>
  </LinearLayout>
-
 </LinearLayout>
@@ -32,7 +32,7 @@ limitations under the License.
      android:layout_height="wrap_content"
      android:textSize="16dip"
      android:textColor="#fff"
-      android:text="@string/waypointslist_pick_one"
+      android:text="@string/marker_list_pick_one"
      android:layout_weight="0"/>
  </LinearLayout>

@@ -40,28 +40,16 @@ limitations under the License.
    android:layout_width="fill_parent"
    android:layout_height="wrap_content"
    android:layout_weight="1"/>
-  <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"/>
+  <LinearLayout style="@style/ButtonLayout">
+    <LinearLayout style="@style/ButtonSpacer"/>
    <Button android:id="@+id/waypointslist_btn_insert_statistics"
-      android:layout_width="wrap_content"
-      android:layout_height="48dip"
-      android:layout_gravity="left|top"
-      android:text="@string/waypointslist_btn_insert_statistics"
-      android:textSize="14dip"/>
+      android:layout_gravity="left"
+      android:text="@string/marker_list_insert_statistics"
+      style="@style/Button"/>
    <Button android:id="@+id/waypointslist_btn_insert_waypoint"
-      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>
+      android:layout_gravity="right"
+      android:text="@string/marker_list_insert_waypoint"
+      style="@style/Button"/>
+    <LinearLayout style="@style/ButtonSpacer"/>
+  </LinearLayout>
 </LinearLayout>
@@ -0,0 +1,65 @@
+<?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>
@@ -0,0 +1,49 @@
+<?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>
@@ -0,0 +1,80 @@
+<?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,20 +37,15 @@ limitations under the License.
        <TextView
          android:id="@+id/speed_label"
          android:layout_span="5"
-          android:text="@string/speed" />
+          android:text="@string/stat_speed" />
      </TableRow>
      <TableRow
        android:background="@color/stat_label_background">
        <TextView
-          android:gravity="right"
+          style="@style/StatsRegister.Big"
          android:id="@+id/speed_register"
          android:layout_column="1"
-          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" />
+          android:layout_span="4"/>
        <LinearLayout
          android:gravity="bottom"
          android:layout_column="5"
@@ -62,24 +57,12 @@ limitations under the License.
            android:layout_width="fill_parent" />
          <TextView
            android:id="@+id/speed_unit_label_top"
-            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" />
+	          style="@style/StatsUnit" />
          <TextView
-            android:background="@color/black"
-            android:layout_height="3dip"
-            android:layout_width="fill_parent" />
+	          style="@style/StatsDivider" />
          <TextView
            android:id="@+id/speed_unit_label_bottom"
-            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" />
+	          style="@style/StatsUnit" />
        </LinearLayout>
      </TableRow>

@@ -90,53 +73,35 @@ limitations under the License.
          android:id="@+id/total_distance_label"
          android:layout_column="1"
          android:layout_span="3"
-          android:text="@string/total_distance_label" />
+          android:text="@string/stat_total_distance" />
        <TextView
          android:id="@+id/max_speed_label"
          android:layout_column="4"
          android:layout_span="2"
-          android:text="@string/max_speed_label" />
+          android:text="@string/stat_max_speed" />
      </TableRow>
      <TableRow
        android:background="@color/stat_label_background">
        <TextView
-          android:gravity="right"
+          style="@style/StatsRegister"
          android:id="@+id/total_distance_register"
-          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" />
+          android:layout_column="1" />
        <TextView
-          android:gravity="left"
          android:id="@+id/total_distance_unit_label"
          android:layout_column="2"
-          android:layout_marginBottom="-9dip"
-          android:layout_marginTop="-9dip"
-          android:text="@string/mile"
-          android:textColor="@color/stat_label_text" />
+	        style="@style/StatsUnitSolo" />
        <!-- 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
-          android:background="@color/black"
-          android:layout_column="3"
-          android:layout_marginBottom="-9dip"
-          android:layout_marginTop="-9dip"
-          android:layout_width="5dip"
-          android:textSize="40sp" />
+          style="@style/StatsSpacer"
+          android:layout_column="3"/>
        <TextView
-          android:gravity="right"
          android:id="@+id/max_speed_register"
-          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" />
+          style="@style/StatsRegister"
+          android:layout_column="4" />
        <LinearLayout
          android:gravity="bottom"
          android:layout_column="5"
@@ -145,24 +110,12 @@ limitations under the License.
          android:orientation="vertical">
          <TextView
            android:id="@+id/max_speed_unit_label_top"
-            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" />
+            style="@style/StatsUnit" />
          <TextView
-            android:background="@color/black"
-            android:layout_height="3dip"
-            android:layout_width="fill_parent" />
+	          style="@style/StatsDivider" />
          <TextView
            android:id="@+id/max_speed_unit_label_bottom"
-            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" />
+            style="@style/StatsUnit" />
        </LinearLayout>
      </TableRow>

@@ -172,43 +125,29 @@ limitations under the License.
          android:id="@+id/track_time_label"
          android:layout_column="1"
          android:layout_span="3"
-          android:text="@string/total_time_label" />
+          android:text="@string/stat_total_time" />
        <TextView
          android:id="@+id/average_speed_label"
          android:layout_column="4"
          android:layout_span="2"
-          android:text="@string/average_speed_label" />
+          android:text="@string/stat_average_speed" />
      </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"
-          android:text="@string/unknown"
-          android:textColor="@color/stat_label_text"
-          android:textSize="40sp" />
+          style="@style/StatsRegister" />
        <TextView
-          android:background="@color/black"
-          android:layout_column="3"
-          android:layout_marginBottom="-9dip"
-          android:layout_marginTop="-9dip"
-          android:layout_width="5dip"
-          android:textSize="40sp" />
+          style="@style/StatsSpacer"
+          android:layout_column="3"/>
        <TextView
-          android:gravity="right"
          android:id="@+id/average_speed_register"
          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" />
+          style="@style/StatsRegister" />
        <LinearLayout
          android:gravity="bottom"
          android:layout_column="5"
@@ -217,24 +156,12 @@ limitations under the License.
          android:orientation="vertical">
          <TextView
            android:id="@+id/average_speed_unit_label_top"
-            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" />
+            style="@style/StatsUnit" />
          <TextView
-            android:background="@color/black"
-            android:layout_height="3dip"
-            android:layout_width="fill_parent" />
+	          style="@style/StatsDivider" />
          <TextView
            android:id="@+id/average_speed_unit_label_bottom"
-            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" />
+            style="@style/StatsUnit" />
        </LinearLayout>
      </TableRow>

@@ -244,43 +171,28 @@ limitations under the License.
          android:id="@+id/moving_time_label"
          android:layout_column="1"
          android:layout_span="3"
-          android:text="@string/moving_time_label" />
+          android:text="@string/stat_moving_time" />
        <TextView
          android:id="@+id/average_moving_speed_label"
          android:layout_column="4"
          android:layout_span="2"
-          android:text="@string/average_moving_speed_label" />
+          android:text="@string/stat_average_moving_speed" />
      </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"
-          android:text="@string/unknown"
-          android:textColor="@color/stat_label_text"
-          android:textSize="40sp" />
+          style="@style/StatsRegister" />
        <TextView
-          android:background="@color/black"
-          android:layout_column="3"
-          android:layout_marginBottom="-9dip"
-          android:layout_marginTop="-9dip"
-          android:layout_width="5dip"
-          android:textSize="40sp" />
+          style="@style/StatsSpacer"
+          android:layout_column="3"/>
        <TextView
-          android:gravity="right"
          android:id="@+id/average_moving_speed_register"
-          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" />
+          style="@style/StatsRegister" />
        <LinearLayout
          android:gravity="bottom"
          android:layout_column="5"
@@ -289,24 +201,14 @@ limitations under the License.
          android:orientation="vertical">
          <TextView
            android:id="@+id/average_moving_speed_unit_label_top"
-            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" />
+            style="@style/StatsUnit" />
          <TextView
-            android:background="@color/black"
+	          style="@style/StatsDivider" />
            android:layout_height="3dip"
            android:layout_width="fill_parent" />
          <TextView
            android:id="@+id/average_moving_speed_unit_label_bottom"
-            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" />
+            style="@style/StatsUnit" />
        </LinearLayout>
      </TableRow>

@@ -316,56 +218,34 @@ limitations under the License.
          android:id="@+id/elevation_label"
          android:layout_column="1"
          android:layout_span="3"
-          android:text="@string/elevation_label" />
+          android:text="@string/stat_elevation" />
        <TextView
          android:id="@+id/elevation_gain_label"
          android:layout_column="4"
          android:layout_span="2"
-          android:text="@string/elevation_gain_label" />
+          android:text="@string/stat_elevation_gain" />
      </TableRow>
      <TableRow
        android:background="@color/stat_label_background">
        <TextView
-          android:gravity="right"
          android:id="@+id/elevation_register"
          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" />
+          style="@style/StatsRegister" />
        <TextView
-          android:gravity="left"
          android:id="@+id/elevation_unit_label"
          android:layout_column="2"
-          android:layout_marginBottom="-9dip"
-          android:layout_marginTop="-9dip"
-          android:text="@string/feet"
-          android:textColor="@color/stat_label_text"/>
+          style="@style/StatsUnitSolo" />
        <TextView
-          android:background="@color/black"
-          android:layout_column="3"
-          android:layout_marginBottom="-9dip"
-          android:layout_marginTop="-9dip"
-          android:layout_width="5dip"
-          android:textSize="40sp" />
+          style="@style/StatsSpacer"
+          android:layout_column="3"/>
        <TextView
-          android:gravity="right"
          android:id="@+id/elevation_gain_register"
          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" />
+          style="@style/StatsRegister" />
        <TextView
-          android:gravity="right"
          android:id="@+id/elevation_gain_unit_label"
          android:layout_column="5"
-          android:layout_marginBottom="-9dip"
-          android:layout_marginTop="-9dip"
-          android:text="@string/feet"
-          android:textColor="@color/stat_label_text" />
+          style="@style/StatsUnitSolo" />
      </TableRow>

      <!-- Min and max elevation -->
@@ -374,56 +254,34 @@ limitations under the License.
          android:id="@+id/min_elevation_label"
          android:layout_column="1"
          android:layout_span="3"
-          android:text="@string/min_elevation_label" />
+          android:text="@string/stat_min_elevation" />
        <TextView
          android:id="@+id/max_elevation_label"
          android:layout_column="4"
          android:layout_span="3"
-          android:text="@string/max_elevation_label" />
+          android:text="@string/stat_max_elevation" />
      </TableRow>
      <TableRow
        android:background="@color/stat_label_background">
        <TextView
-          android:gravity="right"
          android:id="@+id/min_elevation_register"
          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" />
+          style="@style/StatsRegister" />
        <TextView
-          android:gravity="left"
          android:id="@+id/min_elevation_unit_label"
          android:layout_column="2"
-          android:layout_marginBottom="-9dip"
-          android:layout_marginTop="-9dip"
-          android:text="@string/feet"
-          android:textColor="@color/stat_label_text" />
+          style="@style/StatsUnitSolo" />
        <TextView
-          android:background="@color/black"
-          android:layout_column="3"
-          android:layout_marginBottom="-9dip"
-          android:layout_marginTop="-9dip"
-          android:layout_width="5dip"
-          android:textSize="40sp" />
+          style="@style/StatsSpacer"
+          android:layout_column="3"/>
        <TextView
-          android:gravity="right"
          android:id="@+id/max_elevation_register"
          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" />
+          style="@style/StatsRegister" />
        <TextView
-          android:gravity="right"
          android:id="@+id/max_elevation_unit_label"
          android:layout_column="5"
-          android:layout_marginBottom="-9dip"
-          android:layout_marginTop="-9dip"
-          android:text="@string/feet"
-          android:textColor="@color/stat_label_text" />
+          style="@style/StatsUnitSolo" />
      </TableRow>

      <!-- Min and max grade -->
@@ -432,46 +290,28 @@ limitations under the License.
          android:id="@+id/min_grade_label"
          android:layout_column="1"
          android:layout_span="3"
-          android:text="@string/min_grade_label" />
+          android:text="@string/stat_min_grade" />
        <TextView
          android:id="@+id/max_grade_label"
          android:layout_column="4"
          android:layout_span="2"
-          android:text="@string/max_grade_label" />
+          android:text="@string/stat_max_grade" />
      </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"
-          android:text="@string/unknown"
-          android:textColor="@color/stat_label_text"
-          android:textSize="40sp" />
+          style="@style/StatsRegister" />
        <TextView
-          android:background="@color/black"
-          android:layout_column="3"
-          android:layout_marginBottom="-9dip"
-          android:layout_marginTop="-9dip"
-          android:layout_width="5dip"
-          android:textSize="40sp" />
+          style="@style/StatsSpacer"
+          android:layout_column="3"/>
        <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"
-          android:text="@string/unknown"
-          android:textColor="@color/stat_label_text"
-          android:textSize="40sp" />
+          style="@style/StatsRegister" />
      </TableRow>

      <!-- Latitude and Longitude -->
@@ -479,45 +319,28 @@ limitations under the License.
        <TextView
          android:layout_column="1"
          android:layout_span="3"
-          android:text="@string/latitude_label" />
+          android:text="@string/stat_latitude" />
        <TextView
          android:layout_column="4"
          android:layout_span="2"
-          android:text="@string/longitude_label" />
+          android:text="@string/stat_longitude" />
      </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"
-          android:text="@string/unknown"
-          android:textColor="@color/stat_label_text"
-          android:textSize="25sp" />
+          style="@style/StatsRegister.Small" />
        <TextView
-          android:background="@color/black"
+          style="@style/StatsSpacer"
          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"
-          android:text="@string/unknown"
-          android:textColor="@color/stat_label_text"
-          android:textSize="25sp" />
+          style="@style/StatsRegister.Small" />
      </TableRow>

    </TableLayout>
@@ -0,0 +1,112 @@
+<?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>
@@ -0,0 +1,90 @@
+<?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,38 +16,139 @@ 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:layout_width="fill_parent"
  android:orientation="vertical">
-  <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">
+  <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"/>
    <Button
      android:id="@+id/welcome_about"
-      android:layout_width="wrap_content"
-      android:layout_height="48dip"
-      android:layout_gravity="left"
-      android:text="@string/welcome_about"
-      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" />
+      android:text="@string/welcome_about"
+      style="@style/Button"/>
+    <LinearLayout style="@style/ButtonSpacer"/>
  </LinearLayout>
 </LinearLayout>
@@ -1,34 +1,37 @@
 <?xml version="1.0" encoding="utf-8"?>
 <menu xmlns:android="http://schemas.android.com/apk/res/android">
-  <item android:id="@+id/menu_start_recording"
-    android:icon="@drawable/menu_record"
-    android:title="@string/start_recording"/>
+  <item android:id="@+id/menu_record_track"
+    android:icon="@drawable/ic_menu_recordtrack"
+    android:title="@string/menu_record_track"/>

  <item android:id="@+id/menu_stop_recording"
-    android:icon="@drawable/menu_stop"
-    android:title="@string/stop_recording"/>
+    android:icon="@drawable/ic_menu_stoprecording"
+    android:title="@string/menu_stop_recording"/>

-  <item android:id="@+id/menu_list_tracks"
-    android:icon="@drawable/menu_list_tracks"
-    android:title="@string/list_tracks"/>
+  <item android:id="@+id/menu_tracks"
+    android:icon="@drawable/ic_menu_tracklist"
+    android:title="@string/menu_tracks"/>

-  <item android:id="@+id/menu_list_markers"
-    android:icon="@drawable/menu_marker"
-    android:title="@string/list_markers"/>
+  <item android:id="@+id/menu_markers"
+    android:icon="@drawable/ic_menu_waypoints"
+    android:title="@string/menu_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/settings"/>
+    android:title="@string/menu_settings"/>
    
-  <item android:id="@+id/menu_aggregated_stats"
-    android:icon="@android:drawable/ic_menu_info_details"
+  <item android:id="@+id/menu_aggregated_statistics"
    android:orderInCategory="1002"
-    android:title="@string/aggregated_stats"/>
-
+    android:title="@string/menu_aggregated_statistics"/>
+    
  <item android:id="@+id/menu_help"
    android:icon="@android:drawable/ic_menu_info_details"
    android:orderInCategory="1003"
-    android:title="@string/help"/>
-
+    android:title="@string/menu_help"/>
 </menu>
@@ -1,43 +0,0 @@
-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.
@@ -1,284 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-Copyright 2010 Google Inc.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-->
-<resources>
-  <!-- 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
Jimmy Shih	bd887c6624	merge heads	2011-12-16 16:16:08 -08:00
Jimmy Shih	aa392d61e2	merge heads	2011-12-16 16:12:50 -08:00