merge heads

MyTracks/res/drawable/list_bar.xml

@@ -0,0 +1,19 @@
+<?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.
+-->
+<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle">
+  <gradient android:startColor="#ff999999" android:endColor="#ff777777" android:angle="270"/>
+</shape>

MyTracks/res/layout-v14/help_buttons.xml

@@ -0,0 +1,26 @@
+<?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" >
+  <Button
+    android:id="@+id/help_about"
+    android:text="@string/help_about"
+    style="@style/BottomButton" />
+  <Button
+    android:id="@+id/help_ok"
+    android:text="@string/generic_ok"
+    style="@style/BottomButton" />
+</merge>

MyTracks/res/layout-v14/marker_edit_buttons.xml

@@ -0,0 +1,25 @@
+<?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" >
+  <Button
+    android:id="@+id/marker_edit_cancel"
+    android:text="@string/generic_cancel"
+    style="@style/BottomButton" />
+  <Button
+    android:id="@+id/marker_edit_done"
+    style="@style/BottomButton" />
+</merge>

MyTracks/res/layout-v14/track_edit_buttons.xml

@@ -0,0 +1,26 @@
+<?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" >
+  <Button
+    android:id="@+id/track_edit_cancel"
+    android:text="@string/generic_cancel"
+    style="@style/BottomButton" />
+  <Button
+    android:id="@+id/track_edit_save"
+    android:text="@string/generic_save"
+    style="@style/BottomButton" />
+</merge>

MyTracks/res/layout/about.xml

@@ -0,0 +1,78 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+Copyright 2008 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.
+-->
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+  android:layout_height="fill_parent"
+  android:layout_width="fill_parent" >
+
+  <LinearLayout
+    android:layout_height="wrap_content"
+    android:layout_width="fill_parent"
+    android:orientation="vertical"
+    android:padding="8dp" >
+
+    <TextView
+      android:drawableLeft="@drawable/arrow_icon"
+      android:drawablePadding="8dp"
+      android:gravity="center"
+      android:layout_height="wrap_content"
+      android:layout_width="wrap_content"
+      style="@android:style/TextAppearance.DeviceDefault.Medium"
+      android:text="@string/about_copyright_notice" />
+
+    <TextView
+      android:layout_height="wrap_content"
+      android:layout_width="wrap_content"
+      style="@android:style/TextAppearance.DeviceDefault.Large"
+      android:text="@string/about_version" />
+
+    <TextView
+      android:id="@+id/about_version"
+      android:layout_height="wrap_content"
+      android:layout_width="wrap_content"
+      android:paddingLeft="48dp"
+      style="@android:style/TextAppearance.DeviceDefault.Medium" />
+
+    <TextView
+      android:layout_height="wrap_content"
+      android:layout_width="wrap_content"
+      style="@android:style/TextAppearance.DeviceDefault.Large"
+      android:text="@string/about_support" />
+
+    <TextView
+      android:autoLink="web"
+      android:layout_height="wrap_content"
+      android:layout_width="wrap_content"
+      android:paddingLeft="48dp"
+      style="@android:style/TextAppearance.DeviceDefault.Medium"
+      android:text="@string/my_tracks_support_url" />
+
+    <TextView
+      android:layout_height="wrap_content"
+      android:layout_width="wrap_content"
+      style="@android:style/TextAppearance.DeviceDefault.Large"
+      android:text="@string/about_privacy" />
+
+    <TextView
+      android:autoLink="web"
+      android:layout_height="wrap_content"
+      android:layout_width="wrap_content"
+      android:paddingLeft="48dp"
+      style="@android:style/TextAppearance.DeviceDefault.Medium"
+      android:text="@string/my_tracks_privacy_url" />
+  </LinearLayout>
+
+</ScrollView>

MyTracks/res/layout/chart_settings.xml

@@ -0,0 +1,101 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+Copyright 2009 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.
+-->
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+  android:layout_height="fill_parent"
+  android:layout_width="fill_parent" >
+
+  <LinearLayout
+    android:layout_height="wrap_content"
+    android:layout_width="fill_parent"
+    android:orientation="vertical"
+    android:padding="8dp" >
+
+    <TextView
+      android:drawableLeft="@drawable/x_axis"
+      android:drawablePadding="8dp"
+      android:gravity="bottom"
+      android:layout_height="wrap_content"
+      android:layout_width="wrap_content"
+      style="@android:style/TextAppearance.DeviceDefault.Large"
+      android:text="@string/chart_settings_x_axis" />
+
+    <RadioGroup
+      android:id="@+id/chart_settings_x"
+      android:layout_height="wrap_content"
+      android:layout_width="wrap_content" >
+
+      <RadioButton
+        android:id="@+id/chart_settings_by_distance"
+        android:layout_height="wrap_content"
+        android:layout_width="wrap_content"
+        style="@android:style/TextAppearance.DeviceDefault.Medium"
+        android:text="@string/chart_settings_by_distance" />
+
+      <RadioButton
+        android:id="@+id/chart_settings_by_time"
+        android:layout_height="wrap_content"
+        android:layout_width="wrap_content"
+        style="@android:style/TextAppearance.DeviceDefault.Medium"
+        android:text="@string/chart_settings_by_time" />
+    </RadioGroup>
+
+    <TextView
+      android:drawableLeft="@drawable/y_axis"
+      android:drawablePadding="8dp"
+      android:gravity="bottom"
+      android:layout_height="wrap_content"
+      android:layout_width="wrap_content"
+      style="@android:style/TextAppearance.DeviceDefault.Large"
+      android:text="@string/chart_settings_y_axis" />
+
+    <CheckBox
+      android:id="@+id/chart_settings_elevation"
+      android:layout_height="wrap_content"
+      android:layout_width="wrap_content"
+      style="@android:style/TextAppearance.DeviceDefault.Medium"
+      android:text="@string/stat_elevation" />
+
+    <CheckBox
+      android:id="@+id/chart_settings_speed"
+      android:layout_height="wrap_content"
+      android:layout_width="wrap_content"
+      style="@android:style/TextAppearance.DeviceDefault.Medium"
+      android:text="@string/stat_speed" />
+
+    <CheckBox
+      android:id="@+id/chart_settings_power"
+      android:layout_height="wrap_content"
+      android:layout_width="wrap_content"
+      style="@android:style/TextAppearance.DeviceDefault.Medium"
+      android:text="@string/sensor_state_power" />
+
+    <CheckBox
+      android:id="@+id/chart_settings_cadence"
+      android:layout_height="wrap_content"
+      android:layout_width="wrap_content"
+      style="@android:style/TextAppearance.DeviceDefault.Medium"
+      android:text="@string/sensor_state_cadence" />
+
+    <CheckBox
+      android:id="@+id/chart_settings_heart_rate"
+      android:layout_height="wrap_content"
+      android:layout_width="wrap_content"
+      style="@android:style/TextAppearance.DeviceDefault.Medium"
+      android:text="@string/sensor_state_heart_rate" />
+  </LinearLayout>
+
+</ScrollView>

MyTracks/res/layout/choose_map.xml

@@ -0,0 +1,45 @@
+<?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">
+  <TextView
+    android:background="@drawable/list_bar"
+    android:layout_height="wrap_content"
+    android:layout_width="fill_parent"
+    android:padding="5dp"
+    android:text="@string/maps_list_pick_map"
+    android:textColor="@color/white"
+    android:textSize="16sp"/>
+  <ListView
+    android:id="@+id/choose_map_list_view"
+    android:layout_height="fill_parent"
+    android:layout_weight="1"
+    android:layout_width="fill_parent"
+    android:padding="5dp"/>
+  <TextView
+    android:id="@+id/choose_map_empty_view"
+    android:gravity="center"
+    android:layout_height="fill_parent"
+    android:layout_weight="1"
+    android:layout_width="fill_parent"
+    android:padding="5dp"
+    android:textColor="@color/red"
+    android:textSize="16sp"
+    android:textStyle="bold"/>
+</LinearLayout>

MyTracks/res/layout/choose_map_item.xml

@@ -0,0 +1,47 @@
+<?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="wrap_content"
+  android:layout_width="fill_parent"
+  android:orientation="vertical"
+  android:paddingBottom="2dp"
+  android:paddingTop="2dp">
+  <TextView
+    android:id="@+id/choose_map_list_item_title"
+    android:layout_height="wrap_content"
+    android:layout_marginLeft="6dp"
+    android:layout_marginTop="6dp"
+    android:layout_width="fill_parent"
+    android:textColor="@color/white"
+    android:textSize="18sp"
+    android:textStyle="bold"
+    android:singleLine="true"/>
+  <TextView
+    android:id="@+id/choose_map_list_item_description"
+    android:layout_height="wrap_content"
+    android:layout_marginLeft="6dp"
+    android:layout_width="fill_parent"
+    android:textSize="14sp"
+    android:singleLine="true"/>
+  <TextView
+    android:id="@+id/choose_map_list_item_search_status"
+    android:layout_height="wrap_content"
+    android:layout_marginLeft="6dp"
+    android:layout_width="fill_parent"
+    android:textSize="14sp"
+    android:singleLine="true"/>
+</LinearLayout>

MyTracks/res/layout/help.xml

@@ -0,0 +1,30 @@
+<?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.
+-->
+<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" >
+    <include layout="@layout/welcome" />
+  </ScrollView>
+  <LinearLayout style="@style/BottomButtonBar" >
+    <include layout="@layout/help_buttons" />
+  </LinearLayout>
+</LinearLayout>

MyTracks/res/layout/help_buttons.xml

@@ -0,0 +1,26 @@
+<?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" >
+  <Button
+    android:id="@+id/help_ok"
+    android:text="@string/generic_ok"
+    style="@style/BottomButton" />
+  <Button
+    android:id="@+id/help_about"
+    android:text="@string/help_about"
+    style="@style/BottomButton" />
+</merge>

MyTracks/res/layout/help_content.xml

@@ -0,0 +1,114 @@
+<?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:layout_height="wrap_content"
+    android:layout_width="fill_parent"
+    android:orientation="vertical"
+    android:padding="8dp" >
+    <ImageView
+      android:contentDescription="@string/my_tracks_app_name"
+      android:layout_height="wrap_content"
+      android:layout_width="wrap_content"
+      android:scaleType="fitStart"
+      android:src="@drawable/arrow_icon" />
+    <TextView
+      android:text="@string/help_my_tracks_question"
+      style="@style/WelcomeQuestionTextView" />
+    <TextView
+      android:text="@string/help_my_tracks_answer"
+      style="@style/WelcomeAnswerTextView" />
+    <TextView
+      android:text="@string/help_location_precision_question"
+      style="@style/WelcomeQuestionTextView" />
+    <TextView
+      android:text="@string/help_location_precision_answer"
+      style="@style/WelcomeAnswerTextView" />
+    <TextView
+      android:text="@string/help_gps_fix_question"
+      style="@style/WelcomeQuestionTextView" />
+    <TextView
+      android:text="@string/help_gps_fix_answer"
+      style="@style/WelcomeAnswerTextView" />
+    <TextView
+      android:text="@string/help_data_connection_question"
+      style="@style/WelcomeQuestionTextView" />
+    <TextView
+      android:text="@string/help_data_connection_answer"
+      style="@style/WelcomeAnswerTextView" />
+    <TextView
+      android:text="@string/help_elevation_precision_question"
+      style="@style/WelcomeQuestionTextView" />
+    <TextView
+      android:text="@string/help_elevation_precision_answer"
+      style="@style/WelcomeAnswerTextView" />
+    <TextView
+      android:text="@string/help_battery_life_question"
+      style="@style/WelcomeQuestionTextView" />
+    <TextView
+      android:text="@string/help_battery_life_answer"
+      style="@style/WelcomeAnswerTextView" />
+    <TextView
+      android:text="@string/help_share_friends_question"
+      style="@style/WelcomeQuestionTextView" />
+    <TextView
+      android:text="@string/help_share_friends_answer"
+      style="@style/WelcomeAnswerTextView" />
+    <TextView
+      android:text="@string/help_share_visibility_question"
+      style="@style/WelcomeQuestionTextView" />
+    <TextView
+      android:text="@string/help_share_visibility_answer"
+      style="@style/WelcomeAnswerTextView" />
+    <TextView
+      android:text="@string/help_split_track_question"
+      style="@style/WelcomeQuestionTextView" />
+    <TextView
+      android:text="@string/help_split_track_answer"
+      style="@style/WelcomeAnswerTextView" />
+    <TextView
+      android:text="@string/help_saved_files_question"
+      style="@style/WelcomeQuestionTextView" />
+    <TextView
+      android:text="@string/help_saved_files_answer"
+      style="@style/WelcomeAnswerTextView" />
+    <TextView
+      android:text="@string/help_waypoint_marker_question"
+      style="@style/WelcomeQuestionTextView" />
+    <TextView
+      android:text="@string/help_waypoint_marker_answer"
+      style="@style/WelcomeAnswerTextView" />
+    <TextView
+      android:text="@string/help_statistics_marker_question"
+      style="@style/WelcomeQuestionTextView" />
+    <TextView
+      android:text="@string/help_statistics_marker_answer"
+      style="@style/WelcomeAnswerTextView" />
+    <TextView
+      android:text="@string/help_delete_tracks_question"
+      style="@style/WelcomeQuestionTextView" />
+    <TextView
+      android:text="@string/help_delete_tracks_answer"
+      style="@style/WelcomeAnswerTextView" />
+    <TextView
+      android:text="@string/help_edit_tracks_question"
+      style="@style/WelcomeQuestionTextView" />
+    <TextView
+      android:text="@string/help_edit_tracks_answer"
+      style="@style/WelcomeAnswerTextView" />
+  </LinearLayout>
+</merge>

MyTracks/res/layout/list_item.xml

@@ -0,0 +1,54 @@
+<?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.
+-->
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+  android:gravity="center_vertical"
+  android:layout_height="wrap_content"
+  android:layout_width="fill_parent"
+  android:minHeight="?android:attr/listPreferredItemHeight"
+  android:orientation="vertical"
+  android:padding="8dp" >
+  <LinearLayout
+    android:layout_height="wrap_content"
+    android:layout_width="fill_parent"
+    android:orientation="horizontal" >
+    <TextView
+      android:id="@+id/list_item_name"
+      style="@style/ListItemName" />
+    <TextView
+      android:id="@+id/list_item_category"
+      style="@style/ListItemCategory" />
+  </LinearLayout>
+  <LinearLayout
+    android:layout_height="wrap_content"
+    android:layout_width="fill_parent"
+    android:orientation="horizontal" >
+    <TextView
+      android:id="@+id/list_item_total_time"
+      android:layout_marginRight="8dp"
+      style="@style/ListItemStat" />
+    <TextView
+      android:id="@+id/list_item_total_distance"
+      android:layout_marginRight="8dp"
+      style="@style/ListItemStat" />
+    <TextView
+      android:id="@+id/list_item_start_time"
+      style="@style/ListItemStat" />
+  </LinearLayout>
+  <TextView
+    android:id="@+id/list_item_description"
+    style="@style/ListItemDescription" />
+</LinearLayout>

MyTracks/res/layout/marker_detail.xml

@@ -0,0 +1,162 @@
+<?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.
+-->
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+  android:layout_height="fill_parent"
+  android:layout_width="fill_parent" >
+  <LinearLayout
+    android:layout_height="wrap_content"
+    android:layout_width="fill_parent"
+    android:orientation="vertical"
+    android:padding="8dp" >
+    <TextView
+      android:id="@+id/marker_detail_name"
+      style="@style/MarkerDetailLabel" />
+    <LinearLayout
+      android:id="@+id/marker_detail_waypoint_section"
+      android:layout_height="wrap_content"
+      android:layout_width="fill_parent"
+      android:orientation="vertical" >
+      <TextView
+        android:id="@+id/marker_detail_marker_type"
+        style="@style/MarkerDetailLabel" />
+      <TextView
+        android:id="@+id/marker_detail_description"
+        style="@style/MarkerDetailLabel" />
+    </LinearLayout>
+    <TableLayout
+      android:id="@+id/marker_detail_statistics_section"
+      android:layout_height="wrap_content"
+      android:layout_width="fill_parent"
+      android:shrinkColumns="0,2"
+      android:stretchColumns="0,2" >
+      <!-- Total distance and max speed (fastest pace) -->
+      <TableRow>
+        <TextView
+          android:text="@string/stat_total_distance"
+          style="@style/MarkerDetailStatisticsLabel" />
+        <TextView
+          android:id="@+id/marker_detail_max_speed_label"
+          android:layout_column="2"
+          style="@style/MarkerDetailStatisticsLabel" />
+      </TableRow>
+      <TableRow>
+        <TextView
+          android:id="@+id/marker_detail_total_distance_value"
+          style="@style/MarkerDetailStatisticsValue" />
+        <TextView style="@style/MarkerDetailStatisticsSpacer" />
+        <TextView
+          android:id="@+id/marker_detail_max_speed_value"
+          style="@style/MarkerDetailStatisticsValue" />
+      </TableRow>
+      <!-- Total time and average speed (average pace) -->
+      <TableRow>
+        <TextView
+          android:text="@string/stat_total_time"
+          style="@style/MarkerDetailStatisticsLabel" />
+        <TextView
+          android:id="@+id/marker_detail_average_speed_label"
+          android:layout_column="2"
+          style="@style/MarkerDetailStatisticsLabel" />
+      </TableRow>
+      <TableRow>
+        <TextView
+          android:id="@+id/marker_detail_total_time_value"
+          style="@style/MarkerDetailStatisticsValue" />
+        <TextView style="@style/MarkerDetailStatisticsSpacer" />
+        <TextView
+          android:id="@+id/marker_detail_average_speed_value"
+          style="@style/MarkerDetailStatisticsValue" />
+      </TableRow>
+      <!-- Moving time and average moving speed (average moving pace) -->
+      <TableRow>
+        <TextView
+          android:text="@string/stat_moving_time"
+          style="@style/MarkerDetailStatisticsLabel" />
+        <TextView
+          android:id="@+id/marker_detail_average_moving_speed_label"
+          android:layout_column="2"
+          style="@style/MarkerDetailStatisticsLabel" />
+      </TableRow>
+      <TableRow>
+        <TextView
+          android:id="@+id/marker_detail_moving_time_value"
+          style="@style/MarkerDetailStatisticsValue" />
+        <TextView style="@style/MarkerDetailStatisticsSpacer" />
+        <TextView
+          android:id="@+id/marker_detail_average_moving_speed_value"
+          style="@style/MarkerDetailStatisticsValue" />
+      </TableRow>
+      <!-- Elevation and elevation gain -->
+      <TableRow>
+        <TextView
+          android:text="@string/stat_elevation"
+          style="@style/MarkerDetailStatisticsLabel" />
+        <TextView
+          android:layout_column="2"
+          android:text="@string/stat_elevation_gain"
+          style="@style/MarkerDetailStatisticsLabel" />
+      </TableRow>
+      <TableRow>
+        <TextView
+          android:id="@+id/marker_detail_elevation_value"
+          style="@style/MarkerDetailStatisticsValue" />
+        <TextView style="@style/MarkerDetailStatisticsSpacer" />
+        <TextView
+          android:id="@+id/marker_detail_elevation_gain_value"
+          style="@style/MarkerDetailStatisticsValue" />
+      </TableRow>
+      <!-- Min and max elevation -->
+      <TableRow>
+        <TextView
+          android:text="@string/stat_min_elevation"
+          style="@style/MarkerDetailStatisticsLabel" />
+        <TextView
+          android:layout_column="2"
+          android:text="@string/stat_max_elevation"
+          style="@style/MarkerDetailStatisticsLabel" />
+      </TableRow>
+      <TableRow>
+        <TextView
+          android:id="@+id/marker_detail_min_elevation_value"
+          style="@style/MarkerDetailStatisticsValue" />
+        <TextView style="@style/MarkerDetailStatisticsSpacer" />
+        <TextView
+          android:id="@+id/marker_detail_max_elevation_value"
+          style="@style/MarkerDetailStatisticsValue" />
+      </TableRow>
+      <!-- Min and max grade -->
+      <TableRow>
+        <TextView
+          android:text="@string/stat_min_grade"
+          style="@style/MarkerDetailStatisticsLabel" />
+        <TextView
+          android:layout_column="2"
+          android:text="@string/stat_max_grade"
+          style="@style/MarkerDetailStatisticsLabel" />
+      </TableRow>
+      <TableRow>
+        <TextView
+          android:id="@+id/marker_detail_min_grade_value"
+          style="@style/MarkerDetailStatisticsValue" />
+        <TextView style="@style/MarkerDetailStatisticsSpacer" />
+        <TextView
+          android:id="@+id/marker_detail_max_grade_value"
+          style="@style/MarkerDetailStatisticsValue" />
+      </TableRow>
+    </TableLayout>
+  </LinearLayout>
+</ScrollView>

MyTracks/res/layout/marker_edit.xml

@@ -0,0 +1,86 @@
+<?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.
+-->
+<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"
+      android:padding="8dp" >
+      <LinearLayout
+        android:id="@+id/marker_edit_type_section"
+        android:layout_height="wrap_content"
+        android:layout_width="fill_parent"
+        android:orientation="vertical" >
+        <TextView
+          android:text="@string/marker_edit_type"
+          style="@style/EditLabel" />
+        <RadioGroup
+          android:id="@+id/marker_edit_type"
+          android:layout_height="wrap_content"
+          android:layout_width="wrap_content" >
+          <RadioButton
+            android:id="@+id/marker_edit_type_statistics"
+            android:text="@string/marker_edit_type_statistics"
+            style="@style/EditLabel" />
+          <RadioButton
+            android:id="@+id/marker_edit_type_waypoint"
+            android:text="@string/marker_edit_type_waypoint"
+            style="@style/EditLabel" />
+        </RadioGroup>
+      </LinearLayout>
+      <TextView
+        android:text="@string/generic_name"
+        style="@style/EditLabel" />
+      <EditText
+        android:hint="@string/generic_name"
+        android:id="@+id/marker_edit_name"
+        style="@style/EditName" />
+      <LinearLayout
+        android:id="@+id/marker_edit_waypoint_section"
+        android:layout_height="wrap_content"
+        android:layout_width="fill_parent"
+        android:orientation="vertical" >
+        <TextView
+          android:text="@string/marker_edit_marker_type"
+          style="@style/EditLabel" />
+        <AutoCompleteTextView
+          android:hint="@string/marker_edit_marker_type_hint"
+          android:id="@+id/marker_edit_marker_type"
+          android:imeOptions="actionNext"
+          style="@style/EditCategory" />
+        <TextView
+          android:text="@string/generic_description"
+          style="@style/EditLabel" />
+        <EditText
+          android:hint="@string/generic_description"
+          android:id="@+id/marker_edit_description"
+          android:imeOptions="actionDone"
+          style="@style/EditDescription" />
+      </LinearLayout>
+    </LinearLayout>
+  </ScrollView>
+  <LinearLayout style="@style/BottomButtonBar" >
+    <include layout="@layout/marker_edit_buttons" />
+  </LinearLayout>
+</LinearLayout>

MyTracks/res/layout/marker_edit_buttons.xml

@@ -0,0 +1,25 @@
+<?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" >
+  <Button
+    android:id="@+id/marker_edit_done"
+    style="@style/BottomButton" />
+  <Button
+    android:id="@+id/marker_edit_cancel"
+    android:text="@string/generic_cancel"
+    style="@style/BottomButton" />
+</merge>

MyTracks/res/layout/marker_list.xml

@@ -0,0 +1,29 @@
+<?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.
+-->
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+  android:layout_height="fill_parent"
+  android:layout_width="fill_parent" >
+  <ListView
+    android:id="@+id/marker_list"
+    android:layout_height="fill_parent"
+    android:layout_width="fill_parent" />
+  <TextView
+    android:id="@+id/marker_list_empty"
+    android:text="@string/marker_list_empty_message"
+    style="@style/ListEmptyTextView" >
+  </TextView>
+</FrameLayout>

MyTracks/res/layout/mytracks_charts.xml

@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+Copyright 2010 Google Inc.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+<RelativeLayout
+  xmlns:android="http://schemas.android.com/apk/res/android"
+  android:id="@+id/elevation_root"
+  android:orientation="vertical"
+  android:layout_height="fill_parent"
+  android:layout_width="fill_parent">
+  <LinearLayout android:id="@+id/elevation_chart"
+    android:orientation="vertical"
+    android:layout_width="fill_parent"
+    android:layout_height="fill_parent">
+  </LinearLayout>
+  <RelativeLayout android:id="@+id/elevation_zoom_layout"
+    android:orientation="vertical"
+    android:layout_width="fill_parent"
+    android:layout_height="fill_parent"
+    android:padding="10dp">
+    <ZoomControls android:id="@+id/elevation_zoom"
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      android:layout_gravity="center_horizontal"
+      android:layout_alignParentBottom="true"
+      android:layout_centerHorizontal="true"
+      android:layout_alignParentRight="true"/>
+  </RelativeLayout>
+  <LinearLayout android:id="@+id/elevation_busypane"
+    android:orientation="vertical"
+    android:layout_width="fill_parent"
+    android:layout_height="fill_parent"
+    android:padding="3dp"
+    android:visibility="gone">
+    <ProgressBar
+      android:layout_weight="1"
+      android:layout_height="0dp"
+      android:layout_width="wrap_content"
+      android:maxWidth="80dp"
+      android:maxHeight="80dp"
+      android:minWidth="80dp"
+      android:minHeight="80dp"
+      android:layout_gravity="center"/>
+  </LinearLayout>
+</RelativeLayout>

MyTracks/res/layout/mytracks_layout.xml

@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+Copyright 2010 Google Inc.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+<RelativeLayout
+  xmlns:android="http://schemas.android.com/apk/res/android"
+  android:id="@+id/screen"
+  android:layout_width="fill_parent"
+  android:layout_height="fill_parent">
+  <com.google.android.maps.MapView android:id="@+id/map"
+    android:layout_width="fill_parent"
+    android:layout_height="fill_parent"
+    android:clickable="true"
+    android:enabled="true"
+    android:focusable="true"
+    android:focusableInTouchMode="true"
+    android:apiKey="0TXoRmxTinrZKQ9JSazj-9A34XX6_lXsRvTpXWA"/>
+    <!-- corresponding certificate md5: 81:DF:A2:63:53:C7:6B:1E:6C:24:62:D4:91:1C:36:3A -->
+  <LinearLayout android:id="@+id/messagepane"
+    android:orientation="horizontal"
+    android:layout_width="fill_parent"
+    android:layout_height="wrap_content"
+    android:background="@drawable/list_bar"
+    android:padding="3dp"
+    android:visibility="gone">
+    <TextView android:id="@+id/messagetext"
+      android:layout_width="0dp"
+      android:layout_height="wrap_content"
+      android:textSize="16dp"
+      android:textColor="#fff"
+      android:text="@string/gps_wait_for_fix"
+      android:layout_weight="1"/>
+    </LinearLayout>
+    <LinearLayout android:id="@+id/busypane"
+      android:orientation="vertical"
+      android:layout_width="fill_parent"
+      android:layout_height="fill_parent"
+      android:padding="3dp"
+      android:visibility="gone">
+      <ProgressBar
+        android:layout_weight="1"
+        android:layout_height="0dp"
+        android:layout_width="wrap_content"
+        android:maxWidth="80dp"
+        android:maxHeight="80dp"
+        android:minWidth="80dp"
+        android:minHeight="80dp"
+        android:layout_gravity="center"/>
+    </LinearLayout>
+</RelativeLayout>