Update strings for version 56

Update Google Analytics to start one session
per app launch.
2012-09-20 17:27:10 -07:00 · 2012-09-20 13:06:42 -07:00 · 2012-09-19 17:56:30 -07:00 · 2012-09-19 20:22:47 +08:00 · 2012-09-19 20:06:00 +08:00 · 2012-09-19 20:05:10 +08:00
345 changed files with 13317 additions and 10413 deletions
@@ -1,4 +1,4 @@
-#Fri Oct 21 20:06:28 BRST 2011
+#Tue Jul 17 10:23:26 PDT 2012
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
 org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
@@ -76,29 +76,66 @@ 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_annotations_on_field=1585
+org.eclipse.jdt.core.formatter.alignment_for_annotations_on_field.count_dependent=1585|-1|1585
+org.eclipse.jdt.core.formatter.alignment_for_annotations_on_local_variable=1585
+org.eclipse.jdt.core.formatter.alignment_for_annotations_on_local_variable.count_dependent=1585|-1|1585
+org.eclipse.jdt.core.formatter.alignment_for_annotations_on_method=1585
+org.eclipse.jdt.core.formatter.alignment_for_annotations_on_method.count_dependent=1585|-1|1585
+org.eclipse.jdt.core.formatter.alignment_for_annotations_on_package=1585
+org.eclipse.jdt.core.formatter.alignment_for_annotations_on_package.count_dependent=1585|-1|1585
+org.eclipse.jdt.core.formatter.alignment_for_annotations_on_parameter=1040
+org.eclipse.jdt.core.formatter.alignment_for_annotations_on_parameter.count_dependent=1040|-1|1040
+org.eclipse.jdt.core.formatter.alignment_for_annotations_on_type=1585
+org.eclipse.jdt.core.formatter.alignment_for_annotations_on_type.count_dependent=1585|-1|1585
 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression.count_dependent=16|-1|16
 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation.count_dependent=16|-1|16
 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=48
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant.count_dependent=16|-1|16
 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call.count_dependent=16|-1|16
 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation.count_dependent=16|-1|16
 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression.count_dependent=16|-1|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_binary_expression.count_dependent=16|-1|16
+org.eclipse.jdt.core.formatter.alignment_for_cascading_method_invocation_with_arguments=16
+org.eclipse.jdt.core.formatter.alignment_for_cascading_method_invocation_with_arguments.count_dependent=16|-1|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_enum_constants.count_dependent=0|-1|0
 org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16
+org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer.count_dependent=16|-1|16
+org.eclipse.jdt.core.formatter.alignment_for_field_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_for_statement=16
+org.eclipse.jdt.core.formatter.alignment_for_generic_type_arguments=16
+org.eclipse.jdt.core.formatter.alignment_for_generic_type_arguments.count_dependent=16|-1|16
+org.eclipse.jdt.core.formatter.alignment_for_local_variable_declaration=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_multiple_fields.count_dependent=16|-1|16
+org.eclipse.jdt.core.formatter.alignment_for_new_anonymous_class=0
 org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration.count_dependent=16|-1|16
 org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration.count_dependent=16|-1|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_selector_in_method_invocation.count_dependent=16|-1|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_enum_declaration.count_dependent=16|-1|16
 org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration.count_dependent=16|-1|16
 org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration.count_dependent=16|-1|16
 org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration.count_dependent=16|-1|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
@@ -138,12 +175,14 @@ 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.comment_new_line_at_start_of_html_paragraph=true
 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.force_if_else_statement_brace=false
+org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false
 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
@@ -210,6 +249,7 @@ org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_re
 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_comment_prefix=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
@@ -340,7 +380,7 @@ 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_imple_if_on_one_line=false
 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
@@ -348,10 +388,22 @@ 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.sort_local_variable_annotations=false
+org.eclipse.jdt.core.formatter.sort_member_annotations=false
+org.eclipse.jdt.core.formatter.sort_package_annotations=false
+org.eclipse.jdt.core.formatter.sort_parameter_annotations=false
+org.eclipse.jdt.core.formatter.sort_type_annotations=false
 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_comment_inline_tags=false
+org.eclipse.jdt.core.formatter.wrap_non_simple_local_variable_annotation=true
+org.eclipse.jdt.core.formatter.wrap_non_simple_member_annotation=true
+org.eclipse.jdt.core.formatter.wrap_non_simple_package_annotation=true
+org.eclipse.jdt.core.formatter.wrap_non_simple_parameter_annotation=false
+org.eclipse.jdt.core.formatter.wrap_non_simple_type_annotation=true
 org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true
+org.eclipse.jdt.core.formatter.wrap_prefer_two_fragments=false
@@ -1,8 +1,8 @@
-#Thu Jul 21 03:04:13 BRT 2011
+#Tue Jul 17 10:22:06 PDT 2012
 eclipse.preferences.version=1
 editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true
-formatter_profile=_MyTracks
-formatter_settings_version=12
+formatter_profile=_My Tracks
+formatter_settings_version=13
 org.eclipse.jdt.ui.ignorelowercasenames=true
 org.eclipse.jdt.ui.importorder=com;android;java;javax;org;
 org.eclipse.jdt.ui.ondemandthreshold=99
@@ -16,8 +16,8 @@ limitations under the License.
 -->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
  android:installLocation="auto"
-  android:versionCode="48"
-  android:versionName="2.0"
+  android:versionCode="56"
+  android:versionName="2.0.2"
  package="com.google.android.maps.mytracks" >

  <!-- Permission to initialize services -->
@@ -82,7 +82,7 @@ limitations under the License.

  <uses-sdk
    android:minSdkVersion="7"
-    android:targetSdkVersion="15" />
+    android:targetSdkVersion="16" />
  <!-- Required features -->
  <uses-feature
    android:name="android.hardware.location"
@@ -236,10 +236,12 @@ limitations under the License.
    <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_PAUSED" />
+        <action android:name="com.google.android.apps.mytracks.TRACK_RESUMED" />
        <action android:name="com.google.android.apps.mytracks.TRACK_STARTED" />
        <action android:name="com.google.android.apps.mytracks.TRACK_STOPPED" />
+        <action android:name="com.google.android.apps.mytracks.TRACK_UPDATE" />
      </intent-filter>
-
      <meta-data
        android:name="android.appwidget.provider"
        android:resource="@xml/track_widget_info" />
@@ -11,5 +11,5 @@
 split.density=false
 proguard.config=proguard.cfg
 # Project target.
-target=Google Inc.:Google APIs:15
+target=Google Inc.:Google APIs:16
 android.library.reference.1=../MyTracksLib
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-Copyright 2012 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.
-->
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-  android:shape="rectangle" >
-  <solid android:color="@android:color/transparent" />
-  <padding
-    android:bottom="8dp"
-    android:left="8dp"
-    android:right="8dp"
-    android:top="8dp" />
-  <corners android:radius="8dp" />
-  <stroke
-    android:color="@android:color/white"
-    android:width="2dp" />
-</shape>
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-Copyright 2012 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.
-->
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-  android:shape="rectangle" >
-  <solid android:color="@color/track_widget_red" />
-  <padding
-    android:bottom="8dp"
-    android:left="8dp"
-    android:right="8dp"
-    android:top="8dp" />
-  <corners android:radius="8dp" />
-</shape>
@@ -17,10 +17,12 @@ limitations under the License.
 <merge xmlns:android="http://schemas.android.com/apk/res/android" >
  <Button
    android:id="@+id/help_about"
+    android:layout_gravity="left"
    android:text="@string/help_about"
    style="@style/BottomButton" />
  <Button
    android:id="@+id/help_ok"
+    android:layout_gravity="right"
    android:text="@string/generic_ok"
    style="@style/BottomButton" />
 </merge>
@@ -17,9 +17,11 @@ limitations under the License.
 <merge xmlns:android="http://schemas.android.com/apk/res/android" >
  <Button
    android:id="@+id/marker_edit_cancel"
+    android:layout_gravity="left"
    android:text="@string/generic_cancel"
    style="@style/BottomButton" />
  <Button
    android:id="@+id/marker_edit_done"
+    android:layout_gravity="right"
    style="@style/BottomButton" />
 </merge>
@@ -17,10 +17,12 @@ limitations under the License.
 <merge xmlns:android="http://schemas.android.com/apk/res/android" >
  <Button
    android:id="@+id/track_edit_cancel"
+    android:layout_gravity="left"
    android:text="@string/generic_cancel"
    style="@style/BottomButton" />
  <Button
    android:id="@+id/track_edit_save"
+    android:layout_gravity="right"
    android:text="@string/generic_save"
    style="@style/BottomButton" />
 </merge>
@@ -17,10 +17,12 @@ limitations under the License.
 <merge xmlns:android="http://schemas.android.com/apk/res/android" >
  <Button
    android:id="@+id/help_ok"
+    android:layout_gravity="left"
    android:text="@string/generic_ok"
    style="@style/BottomButton" />
  <Button
    android:id="@+id/help_about"
+    android:layout_gravity="right"
    android:text="@string/help_about"
    style="@style/BottomButton" />
 </merge>
@@ -61,6 +61,10 @@ limitations under the License.
        android:id="@+id/list_item_start_time"
        style="@style/ListItemStats" />
    </LinearLayout>
+    <TextView
+        android:id="@+id/list_item_recording"
+        android:singleLine="true"
+        style="@style/TextSmall" />
    <TextView
      android:id="@+id/list_item_description"
      android:singleLine="false"
@@ -17,9 +17,11 @@ limitations under the License.
 <merge xmlns:android="http://schemas.android.com/apk/res/android" >
  <Button
    android:id="@+id/marker_edit_done"
+    android:layout_gravity="left"
    style="@style/BottomButton" />
  <Button
    android:id="@+id/marker_edit_cancel"
+    android:layout_gravity="right"
    android:text="@string/generic_cancel"
    style="@style/BottomButton" />
 </merge>
@@ -29,21 +29,32 @@ limitations under the License.
  <!-- Total time/moving time -->
  <TableRow>
    <TextView
-      android:id="@+id/stats_total_time_label"
+      android:text="@string/stats_total_time"
+      style="@style/StatsLabel" />
+    <TextView
+      android:id="@+id/stats_moving_time_label"
+      android:layout_column="2"
+      android:text="@string/stats_moving_time"
      style="@style/StatsLabel" />
  </TableRow>
  <TableRow>
    <TextView
      android:id="@+id/stats_total_time_value"
      style="@style/StatsValue" />
+    <TextView 
+      android:id="@+id/stats_moving_time_spacer"
+      style="@style/StatsSpacer" />
+    <TextView
+      android:id="@+id/stats_moving_time_value"
+      style="@style/StatsValue" />
  </TableRow>
-  <!-- Average speed/average moving speed and max speed (average pace/average moving pace and fastest pace) -->
+  <!-- Average speed/average moving speed (average pace/average moving pace) -->
  <TableRow>
    <TextView
      android:id="@+id/stats_average_speed_label"
      style="@style/StatsLabel" />
    <TextView
-      android:id="@+id/stats_max_speed_label"
+      android:id="@+id/stats_average_moving_speed_label"
      android:layout_column="2"
      style="@style/StatsLabel" />
  </TableRow>
@@ -51,7 +62,20 @@ limitations under the License.
    <TextView
      android:id="@+id/stats_average_speed_value"
      style="@style/StatsValue" />
-    <TextView style="@style/StatsSpacer" />
+    <TextView 
+      android:id="@+id/stats_average_moving_speed_spacer"
+      style="@style/StatsSpacer" />
+    <TextView
+      android:id="@+id/stats_average_moving_speed_value"
+      style="@style/StatsValue" />
+  </TableRow>
+  <!-- Max speed (fastest pace) -->
+  <TableRow>
+    <TextView
+      android:id="@+id/stats_max_speed_label"
+      style="@style/StatsLabel" />
+  </TableRow>
+  <TableRow>
    <TextView
      android:id="@+id/stats_max_speed_value"
      style="@style/StatsValue" />
@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+Copyright 2012 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.
+-->
+<merge xmlns:android="http://schemas.android.com/apk/res/android" >
+  <LinearLayout
+    android:background="@color/black"
+    android:layout_height="wrap_content"
+    android:layout_width="fill_parent"
+    android:orientation="horizontal"
+    android:paddingBottom="8dp"
+    android:paddingTop="8dp" >
+    <View
+      android:layout_height="fill_parent"
+      android:layout_weight="1"
+      android:layout_width="0dp" />
+    <ImageButton
+      android:background="@android:color/transparent"
+      android:contentDescription="@string/icon_record_track"
+      android:id="@+id/track_controller_record"
+      android:layout_height="wrap_content"
+      android:layout_weight="10"
+      android:layout_width="0dp" />
+    <RelativeLayout
+      android:layout_height="fill_parent"
+      android:layout_weight="6"
+      android:layout_width="0dp" >
+      <TextView
+        android:id="@+id/track_controller_total_time"
+        android:layout_alignParentLeft="true"
+        android:layout_centerVertical="true"
+        android:layout_height="wrap_content"
+        android:layout_width="wrap_content"
+        android:textColor="@android:color/white"
+        style="@style/TextSmall" />
+      <TextView
+        android:id="@+id/track_controller_status"
+        android:layout_above="@id/track_controller_total_time"
+        android:layout_alignParentLeft="true"
+        android:layout_height="wrap_content"
+        android:layout_width="wrap_content"
+        android:singleLine="true"
+        style="@style/TextTiny" />
+    </RelativeLayout>
+    <ImageButton
+      android:background="@android:color/transparent"
+      android:contentDescription="@string/icon_stop_recording"
+      android:id="@+id/track_controller_stop"
+      android:layout_height="wrap_content"
+      android:layout_weight="10"
+      android:layout_width="0dp"
+      android:src="@drawable/btn_stop_1" />
+    <View
+      android:layout_height="fill_parent"
+      android:layout_weight="1"
+      android:layout_width="0dp" />
+  </LinearLayout>
+  <View
+    android:background="@color/gray"
+    android:layout_height="1dp"
+    android:layout_width="fill_parent" />
+</merge>
@@ -14,29 +14,40 @@ 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.
 -->
-<TabHost xmlns:android="http://schemas.android.com/apk/res/android"
-  android:id="@android:id/tabhost"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
  android:layout_height="fill_parent"
-  android:layout_width="fill_parent" >
-  <LinearLayout
-    android:layout_height="fill_parent"
-    android:layout_width="fill_parent"
-    android:orientation="vertical" >
-    <TabWidget
-      android:id="@android:id/tabs"
-      android:layout_height="wrap_content"
-      android:layout_weight="0"
+  android:layout_width="fill_parent"
+  android:orientation="vertical" >
+  <TabHost
+    android:id="@android:id/tabhost"
+    android:layout_height="0dp"
+    android:layout_weight="1"
+    android:layout_width="fill_parent" >
+    <LinearLayout
+      android:layout_height="fill_parent"
      android:layout_width="fill_parent"
-      android:orientation="horizontal" />
-    <FrameLayout
-      android:id="@android:id/tabcontent"
-      android:layout_height="0dp"
-      android:layout_weight="0"
-      android:layout_width="0dp" />
-    <FrameLayout
-      android:id="@+id/realtabcontent"
-      android:layout_height="0dp"
-      android:layout_weight="1"
-      android:layout_width="fill_parent" />
+      android:orientation="vertical" >
+      <TabWidget
+        android:id="@android:id/tabs"
+        android:layout_height="wrap_content"
+        android:layout_weight="0"
+        android:layout_width="fill_parent"
+        android:orientation="horizontal" />
+      <FrameLayout
+        android:id="@android:id/tabcontent"
+        android:layout_height="0dp"
+        android:layout_weight="0"
+        android:layout_width="0dp" />
+      <FrameLayout
+        android:id="@+id/realtabcontent"
+        android:layout_height="0dp"
+        android:layout_weight="1"
+        android:layout_width="fill_parent" />
+    </LinearLayout>
+  </TabHost>
+  <LinearLayout
+    android:id="@+id/track_controler_container"
+    style="@style/TrackControllerContainer" >
+    <include layout="@layout/track_controller" />
  </LinearLayout>
-</TabHost>
+</LinearLayout>
@@ -17,10 +17,12 @@ limitations under the License.
 <merge xmlns:android="http://schemas.android.com/apk/res/android" >
  <Button
    android:id="@+id/track_edit_save"
+    android:layout_gravity="left"
    android:text="@string/generic_save"
    style="@style/BottomButton" />
  <Button
    android:id="@+id/track_edit_cancel"
+    android:layout_gravity="right"
    android:text="@string/generic_cancel"
    style="@style/BottomButton" />
 </merge>
@@ -14,34 +14,27 @@ 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.
 -->
-<merge xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
  android:layout_height="fill_parent"
-  android:layout_width="fill_parent" >
+  android:layout_width="fill_parent"
+  android:orientation="vertical" >
  <ListView
    android:id="@+id/track_list"
-    android:layout_height="fill_parent"
+    android:layout_height="0dp"
+    android:layout_weight="1.0"
    android:layout_width="fill_parent" />
-  <LinearLayout
-    android:gravity="center"
-    android:id="@+id/track_list_empty"
-    android:layout_height="fill_parent"
+  <TextView
+    android:id="@+id/track_list_empty_view"
+    android:layout_height="0dp"
+    android:layout_weight="1.0"
    android:layout_width="fill_parent"
-    android:orientation="vertical" >
-    <TextView
-      android:id="@+id/track_list_empty_message"
-      android:text="@string/track_list_empty_message"
-      android:visibility="gone"
-      style="@style/ListEmptyTextView" >
-    </TextView>
-    <ImageButton
-      android:background="@color/transparent"
-      android:contentDescription="@string/menu_record_track"
-      android:id="@+id/track_list_record_button"
-      android:layout_height="wrap_content"
-      android:layout_width="wrap_content"
-      android:padding="16dp"
-      android:src="@drawable/menu_record_track"
-      android:visibility="gone"
-      style="@android:style/Widget.DeviceDefault.ImageButton" />
+    android:text="@string/track_list_empty_message"
+    android:visibility="gone"
+    style="@style/ListEmptyTextView" >
+  </TextView>
+  <LinearLayout
+    android:id="@+id/track_controler_container"
+    style="@style/TrackControllerContainer" >
+    <include layout="@layout/track_controller" />
  </LinearLayout>
-</merge>
+</LinearLayout>
@@ -15,83 +15,100 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+  android:background="@drawable/track_widget_background"
  android:layout_height="fill_parent"
  android:layout_width="fill_parent"
  android:padding="@dimen/widget_margin" >
  <LinearLayout
-    android:background="@drawable/track_widget_background"
    android:layout_height="fill_parent"
    android:layout_width="fill_parent"
-    android:orientation="horizontal" >
-    <ImageButton
-      android:background="@android:color/transparent"
-      android:contentDescription="@string/my_tracks_app_name"
-      android:id="@+id/track_widget_icon"
-      android:layout_height="fill_parent"
-      android:layout_width="wrap_content"
-      android:padding="8dp"
-      android:src="@drawable/my_tracks_icon" />
+    android:orientation="vertical"
+    android:paddingBottom="8dp"
+    android:paddingLeft="16dp"
+    android:paddingRight="16dp"
+    android:paddingTop="8dp" >
    <LinearLayout
      android:clickable="true"
      android:id="@+id/track_widget_statistics"
-      android:layout_height="fill_parent"
-      android:layout_weight="1"
-      android:layout_width="0dp"
-      android:orientation="vertical"
-      android:paddingLeft="8dp" >
-      <LinearLayout
-        android:layout_height="wrap_content"
-        android:layout_width="fill_parent"
-        android:orientation="horizontal" >
-        <TextView
-          android:id="@+id/track_widget_distance_value"
-          style="@style/TrackWidgetValue" />
+      android:layout_height="wrap_content"
+      android:layout_width="fill_parent"
+      android:orientation="vertical" >
+      <LinearLayout style="@style/TrackWidgetStat" >
        <TextView
          android:text="@string/stats_total_distance"
          style="@style/TrackWidgetLabel" />
+        <TextView style="@style/TrackWidgetSpacer" />
+        <TextView
+          android:id="@+id/track_widget_total_distance_value"
+          style="@style/TrackWidgetLabel" />
      </LinearLayout>
-      <LinearLayout
-        android:background="@color/track_widget_line"
-        android:layout_height="1dp"
-        android:layout_width="fill_parent" />
-      <LinearLayout
-        android:layout_height="wrap_content"
-        android:layout_width="fill_parent"
-        android:orientation="horizontal" >
+      <LinearLayout style="@style/TrackWidgetSeparator" />
+      <LinearLayout style="@style/TrackWidgetStat" >
        <TextView
-          android:id="@+id/track_widget_time_value"
-          style="@style/TrackWidgetValue" />
+          android:text="@string/stats_total_time"
+          style="@style/TrackWidgetLabel" />
+        <TextView style="@style/TrackWidgetSpacer" />
+        <Chronometer
+          android:id="@+id/track_widget_total_time_value"
+          style="@style/TrackWidgetLabel" />
+      </LinearLayout>
+      <LinearLayout style="@style/TrackWidgetSeparator" />
+      <LinearLayout style="@style/TrackWidgetStat" >
        <TextView
-          android:id="@+id/track_widget_time_label"
+          android:id="@+id/track_widget_average_speed_label"
+          style="@style/TrackWidgetLabel" />
+        <TextView style="@style/TrackWidgetSpacer" />
+        <TextView
+          android:id="@+id/track_widget_average_speed_value"
          style="@style/TrackWidgetLabel" />
      </LinearLayout>
      <LinearLayout
-        android:background="@color/track_widget_line"
-        android:layout_height="1dp"
-        android:layout_width="fill_parent" />
-      <LinearLayout
+        android:id="@+id/track_widget_moving_time_container"
        android:layout_height="wrap_content"
        android:layout_width="fill_parent"
-        android:orientation="horizontal" >
-        <TextView
-          android:id="@+id/track_widget_speed_value"
-          style="@style/TrackWidgetValue" />
-        <TextView
-          android:id="@+id/track_widget_speed_label"
-          style="@style/TrackWidgetLabel" />
+        android:orientation="vertical" >
+        <LinearLayout style="@style/TrackWidgetSeparator" />
+        <LinearLayout style="@style/TrackWidgetStat" >
+          <TextView
+            android:text="@string/stats_moving_time"
+            style="@style/TrackWidgetLabel" />
+          <TextView style="@style/TrackWidgetSpacer" />
+          <TextView
+            android:id="@+id/track_widget_moving_time_value"
+            style="@style/TrackWidgetLabel" />
+        </LinearLayout>
      </LinearLayout>
+    </LinearLayout>
+    <LinearLayout
+      android:clipChildren="false"
+      android:layout_height="wrap_content"
+      android:layout_width="fill_parent"
+      android:orientation="horizontal"
+      android:paddingLeft="4dp"
+      android:paddingRight="4dp"
+      android:paddingTop="4dp" >
      <ImageButton
-        android:background="@drawable/track_widget_record_button_background"
-        android:contentDescription="@string/menu_record_track"
+        android:background="@android:color/transparent"
+        android:contentDescription="@string/icon_record_track"
        android:id="@+id/track_widget_record_button"
-        android:src="@drawable/track_widget_record_button"
-        style="@style/TrackWidgetButton" />
+        android:layout_height="wrap_content"
+        android:layout_width="wrap_content"
+        android:src="@drawable/btn_record" />
+      <TextView
+        android:id="@+id/track_widget_record_status"
+        android:layout_gravity="center_vertical"
+        android:layout_height="wrap_content"
+        android:layout_weight="1"
+        android:layout_width="0dp"
+        android:singleLine="true"
+        style="@style/TextSmall" />
      <ImageButton
-        android:background="@drawable/track_widget_stop_button_background"
-        android:contentDescription="@string/menu_stop_recording"
+        android:background="@android:color/transparent"
+        android:contentDescription="@string/icon_stop_recording"
        android:id="@+id/track_widget_stop_button"
-        android:src="@drawable/track_widget_stop_button"
-        style="@style/TrackWidgetButton" />
+        android:layout_height="wrap_content"
+        android:layout_width="wrap_content"
+        android:src="@drawable/btn_stop_0" />
    </LinearLayout>
  </LinearLayout>
 </FrameLayout>
@@ -18,5 +18,6 @@ limitations under the License.
  <item
    android:icon="@drawable/menu_satellite_mode"
    android:id="@+id/map_satellite_mode"
-    android:orderInCategory="6"/>
+    android:orderInCategory="5"
+    android:showAsAction="ifRoom"/>
 </menu>
@@ -24,6 +24,6 @@ limitations under the License.
    android:actionViewClass="android.widget.SearchView"
    android:icon="@drawable/menu_search"
    android:id="@+id/marker_list_search"
-    android:showAsAction="always|collapseActionView"
+    android:showAsAction="ifRoom|collapseActionView"
    android:title="@string/menu_search"/>
 </menu>
@@ -19,6 +19,6 @@ limitations under the License.
    android:actionViewClass="android.widget.SearchView"
    android:icon="@drawable/menu_search"
    android:id="@+id/search_list_search"
-    android:showAsAction="always|collapseActionView"
+    android:showAsAction="ifRoom|collapseActionView"
    android:title="@string/menu_search"/>
 </menu>
@@ -15,57 +15,41 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 <menu xmlns:android="http://schemas.android.com/apk/res/android" >
-  <item
-    android:icon="@drawable/menu_stop_recording"
-    android:id="@+id/track_detail_stop_recording"
-    android:orderInCategory="1"
-    android:showAsAction="ifRoom"
-    android:title="@string/menu_stop_recording"/>
  <item
    android:icon="@drawable/menu_insert_marker"
    android:id="@+id/track_detail_insert_marker"
-    android:orderInCategory="2"
+    android:orderInCategory="1"
    android:showAsAction="ifRoom"
    android:title="@string/menu_insert_marker"/>
  <item
    android:icon="@drawable/menu_play"
    android:id="@+id/track_detail_play"
-    android:orderInCategory="3"
+    android:orderInCategory="2"
    android:showAsAction="ifRoom"
    android:title="@string/menu_play"/>
  <item
    android:icon="@drawable/menu_share"
    android:id="@+id/track_detail_share"
-    android:orderInCategory="4"
+    android:orderInCategory="3"
    android:showAsAction="ifRoom"
    android:title="@string/menu_share">
  </item>
  <item
    android:icon="@drawable/menu_markers"
    android:id="@+id/track_detail_markers"
-    android:orderInCategory="5"
+    android:orderInCategory="4"
    android:showAsAction="ifRoom"
    android:title="@string/menu_markers"/>
-  <!-- android:orderInCategory="6" is in map.xml -->
-  <item
-    android:icon="@drawable/menu_voice_frequency"
-    android:id="@+id/track_detail_voice_frequency"
-    android:orderInCategory="7"
-    android:title="@string/menu_voice_frequency"/>
-  <item
-    android:icon="@drawable/menu_split_frequency"
-    android:id="@+id/track_detail_split_frequency"
-    android:orderInCategory="8"
-    android:title="@string/menu_split_frequency"/>
+  <!-- android:orderInCategory="5" is in map.xml -->
  <item
    android:icon="@drawable/menu_send_google"
    android:id="@+id/track_detail_send_google"
-    android:orderInCategory="9"
+    android:orderInCategory="6"
    android:title="@string/menu_send_google"/>
  <item
    android:icon="@drawable/menu_save"
    android:id="@+id/track_detail_save"
-    android:orderInCategory="10"
+    android:orderInCategory="7"
    android:title="@string/menu_save">
    <menu>
      <item android:id="@+id/track_detail_save_gpx"/>
@@ -77,26 +61,36 @@ limitations under the License.
  <item
    android:icon="@drawable/menu_edit"
    android:id="@+id/track_detail_edit"
-    android:orderInCategory="11"
+    android:orderInCategory="8"
    android:title="@string/menu_edit"/>
  <item
    android:icon="@drawable/menu_delete"
    android:id="@+id/track_detail_delete"
-    android:orderInCategory="12"
+    android:orderInCategory="9"
    android:title="@string/menu_delete"/>
+  <item
+    android:icon="@drawable/menu_voice_frequency"
+    android:id="@+id/track_detail_voice_frequency"
+    android:orderInCategory="10"
+    android:title="@string/menu_voice_frequency"/>
+  <item
+    android:icon="@drawable/menu_split_frequency"
+    android:id="@+id/track_detail_split_frequency"
+    android:orderInCategory="11"
+    android:title="@string/menu_split_frequency"/>
  <item
    android:icon="@drawable/menu_sensor_state"
    android:id="@+id/track_detail_sensor_state"
-    android:orderInCategory="13"
+    android:orderInCategory="12"
    android:title="@string/menu_sensor_state"/>
  <item
    android:icon="@drawable/menu_settings"
    android:id="@+id/track_detail_settings"
-    android:orderInCategory="14"
+    android:orderInCategory="13"
    android:title="@string/menu_settings"/>
  <item
    android:icon="@drawable/menu_help"
    android:id="@+id/track_detail_help"
-    android:orderInCategory="15"
+    android:orderInCategory="14"
    android:title="@string/menu_help"/>
 </menu>
@@ -15,22 +15,17 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 <menu xmlns:android="http://schemas.android.com/apk/res/android" >
-  <item
-    android:icon="@drawable/menu_record_track"
-    android:id="@+id/track_list_record_track"
-    android:showAsAction="ifRoom"
-    android:title="@string/menu_record_track"/>
-  <item
-    android:icon="@drawable/menu_stop_recording"
-    android:id="@+id/track_list_stop_recording"
-    android:showAsAction="ifRoom"
-    android:title="@string/menu_stop_recording"/>
  <item
    android:actionViewClass="android.widget.SearchView"
    android:icon="@drawable/menu_search"
    android:id="@+id/track_list_search"
-    android:showAsAction="always|collapseActionView"
+    android:showAsAction="ifRoom|collapseActionView"
    android:title="@string/menu_search"/>
+  <item
+    android:icon="@drawable/menu_start_gps"
+    android:id="@+id/track_list_start_gps"
+    android:showAsAction="ifRoom"
+    android:title="@string/menu_start_gps"/>
  <item
    android:icon="@drawable/menu_import"
    android:id="@+id/track_list_import"
--- a/Show More
+++ b/Show More