fix comment on f87ee43bcbb1

MyTracks/res/drawable/left_arrow_chart_stateful.xml

@@ -0,0 +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.
+-->
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+
+  <item android:state_window_focused="false"
+        android:drawable="@drawable/left_arrow_chart" />
+
+  <item android:state_pressed="true"
+        android:drawable="@drawable/left_arrow_chart_press" />
+
+  <item android:drawable="@drawable/left_arrow_chart" />
+
+</selector>

MyTracks/res/drawable/left_arrow_stats_stateful.xml

@@ -0,0 +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.
+-->
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+
+  <item android:state_window_focused="false"
+        android:drawable="@drawable/left_arrow_stats" />
+
+  <item android:state_pressed="true"
+        android:drawable="@drawable/left_arrow_stats_press" />
+
+  <item android:drawable="@drawable/left_arrow_stats" />
+
+</selector>

MyTracks/res/drawable/left_arrow_track_stateful.xml

@@ -0,0 +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.
+-->
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+
+  <item android:state_window_focused="false"
+        android:drawable="@drawable/left_arrow_track" />
+
+  <item android:state_pressed="true"
+        android:drawable="@drawable/left_arrow_track_press" />
+
+  <item android:drawable="@drawable/left_arrow_track" />
+
+</selector>

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/drawable/right_arrow_chart_stateful.xml

@@ -0,0 +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.
+-->
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+
+  <item android:state_window_focused="false"
+        android:drawable="@drawable/right_arrow_chart" />
+
+  <item android:state_pressed="true"
+        android:drawable="@drawable/right_arrow_chart_press" />
+
+  <item android:drawable="@drawable/right_arrow_chart" />
+
+</selector>

MyTracks/res/drawable/right_arrow_stats_stateful.xml

@@ -0,0 +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.
+-->
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+
+  <item android:state_window_focused="false"
+        android:drawable="@drawable/right_arrow_stats" />
+
+  <item android:state_pressed="true"
+        android:drawable="@drawable/right_arrow_stats_press" />
+
+  <item android:drawable="@drawable/right_arrow_stats" />
+
+</selector>

MyTracks/res/drawable/right_arrow_track_stateful.xml

@@ -0,0 +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.
+-->
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+
+  <item android:state_window_focused="false"
+        android:drawable="@drawable/right_arrow_track" />
+
+  <item android:state_pressed="true"
+        android:drawable="@drawable/right_arrow_track_press" />
+
+  <item android:drawable="@drawable/right_arrow_track" />
+
+</selector>

MyTracks/res/layout/about.xml

@@ -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/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,81 @@
+<?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>
+    <LinearLayout
+      android:orientation="horizontal"
+      android:layout_width="fill_parent"
+      android:layout_height="wrap_content"
+      android:layout_alignParentBottom="true"
+      android:layout_gravity="center"
+      android:paddingTop="10dp">
+      <LinearLayout
+        android:layout_width = "wrap_content"
+        android:layout_height= "wrap_content"
+        android:layout_weight="1"/>
+      <ImageButton
+        android:id="@+id/showOptions"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_weight="0"
+        android:visibility="visible"
+        android:src="@android:drawable/ic_menu_more"/>
+    </LinearLayout>
+</RelativeLayout>

MyTracks/res/layout/mytracks_list.xml

@@ -0,0 +1,58 @@
+<?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"
+  xmlns:app="http://schemas.android.com/apl/res/com.google.android.apps.mytracks"
+  android:id="@+id/tracklist_root"
+  android:orientation="vertical"
+  android:layout_width="fill_parent"
+  android:layout_height="fill_parent">
+  <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="3dp">
+    <TextView android:id="@+id/message"
+      android:layout_width="0dp"
+      android:layout_height="wrap_content"
+      android:textSize="16dp"
+      android:textColor="#fff"
+      android:text="@string/track_list_pick_one"
+      android:layout_weight="1"/>
+  </LinearLayout>
+  <ListView android:id="@android:id/list"
+    android:layout_width="fill_parent"
+    android:layout_height="wrap_content"
+    android:layout_weight="1"/>
+  <LinearLayout style="@style/ButtonLayout">
+    <LinearLayout style="@style/ButtonSpacer"/>
+    <Button android:id="@+id/tracklist_btn_import_all"
+      android:layout_gravity="left"
+      android:text="@string/track_list_import_all"
+      style="@style/Button"/>
+    <Button android:id="@+id/tracklist_btn_export_all"
+      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_gravity="right"
+      android:text="@string/track_list_delete_all"
+      style="@style/Button"/>
+    <LinearLayout style="@style/ButtonSpacer"/>
+  </LinearLayout>
+</LinearLayout>

MyTracks/res/layout/mytracks_list_item.xml

@@ -0,0 +1,74 @@
+<?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:minHeight="?android:attr/listPreferredItemHeight"
+  android:orientation="vertical"
+  android:paddingBottom="2dp"
+  android:paddingTop="2dp">
+
+  <LinearLayout
+    android:layout_height="wrap_content"
+    android:layout_width="fill_parent"
+    android:orientation="horizontal">
+    <ImageView android:id="@+id/track_list_item_icon"
+      android:contentDescription="@string/track_icon_description"
+      android:layout_height="wrap_content"
+      android:layout_width="wrap_content"
+      android:paddingLeft="4dp"
+      android:paddingRight="2dp"
+      android:paddingTop="5dp"
+      android:src="@drawable/track" />
+    <TextView android:id="@+id/track_list_item_name"
+      android:layout_height="wrap_content"
+      android:layout_marginLeft="6dp"
+      android:layout_marginTop="6dp"
+      android:layout_width="wrap_content"
+      android:singleLine="true"
+      android:textAppearance="?android:attr/textAppearanceLarge"/>
+    <TextView android:id="@+id/track_list_item_category"
+      android:layout_height="wrap_content"
+      android:layout_marginLeft="6dp"
+      android:layout_marginTop="6dp"
+      android:layout_width="fill_parent"
+      android:singleLine = "true"
+      android:textAppearance="?android:attr/textAppearanceSmall"/>
+  </LinearLayout>
+
+  <TextView android:id="@+id/track_list_item_time"
+    android:layout_width="fill_parent"
+    android:layout_height="wrap_content"
+    android:layout_marginLeft="6dp"
+    android:singleLine="true"
+    android:textColor="#fff"
+    android:textAppearance="?android:attr/textAppearanceSmall"/>
+  <TextView android:id="@+id/track_list_item_stats"
+    android:layout_width="fill_parent"
+    android:layout_height="wrap_content"
+    android:layout_marginLeft="6dp"
+    android:singleLine="true"
+    android:textColor="#0f0"
+    android:textAppearance="?android:attr/textAppearanceSmall"/>
+  <TextView android:id="@+id/track_list_item_description"
+    android:layout_width="fill_parent"
+    android:layout_height="wrap_content"
+    android:layout_marginLeft = "6dp"
+    android:singleLine = "false"
+    android:textAppearance="?android:attr/textAppearanceSmall"/>
+
+</LinearLayout>

MyTracks/res/layout/mytracks_marker_item.xml

@@ -0,0 +1,61 @@
+<?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:minHeight="?android:attr/listPreferredItemHeight"
+  android:orientation="horizontal"
+  android:paddingBottom="2dp"
+  android:paddingTop="2dp" >
+  <ImageView
+    android:contentDescription="@string/marker_icon_description"
+    android:id="@+id/waypointslist_item_icon"
+    android:layout_height="wrap_content"
+    android:layout_marginLeft="6dp"
+    android:layout_marginTop="6dp"
+    android:layout_width="wrap_content"
+    android:src="@drawable/ylw_pushpin" />
+  <LinearLayout
+    android:layout_height="wrap_content"
+    android:layout_width="fill_parent"
+    android:orientation="vertical" >
+    <TextView
+      android:id="@+id/waypointslist_item_name"
+      android:layout_height="wrap_content"
+      android:layout_marginLeft="6dp"
+      android:layout_marginTop="6dp"
+      android:layout_width="fill_parent"
+      android:singleLine="true"
+      android:textAppearance="?android:attr/textAppearanceLarge" />
+    <TextView
+      android:id="@+id/waypointslist_item_time"
+      android:layout_height="wrap_content"
+      android:layout_marginLeft="6dp"
+      android:layout_width="fill_parent"
+      android:singleLine="true"
+      android:textAppearance="?android:attr/textAppearanceSmall"
+      android:textColor="#fff" />
+    <TextView
+      android:id="@+id/waypointslist_item_category"
+      android:layout_height="wrap_content"
+      android:layout_marginLeft="6dp"
+      android:layout_width="fill_parent"
+      android:singleLine="true"
+      android:textAppearance="?android:attr/textAppearanceSmall"
+      android:textColor="#0f0" />
+  </LinearLayout>
+</LinearLayout>

MyTracks/res/layout/mytracks_waypoint_details.xml

@@ -0,0 +1,503 @@
+<?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:background="#c000">
+  <ScrollView
+    android:id="@+id/scrolly"
+    android:layout_height="0dp"
+    android:layout_weight="1"
+    android:layout_width="fill_parent"
+    android:scrollbarStyle="insideInset">
+
+    <LinearLayout
+      android:layout_width="fill_parent"
+      android:layout_height="wrap_content"
+      android:orientation="vertical">
+      <TextView android:text="@string/marker_detail_marker_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/waypointdetails_icon"
+          android:contentDescription="@string/marker_icon_description"
+          android:src="@drawable/ylw_pushpin"
+          android:layout_width="wrap_content"
+          android:layout_height="wrap_content"
+          android:layout_gravity="center"
+          android:paddingLeft="4dp"
+          android:paddingRight="2dp"/>
+        <EditText android:id="@+id/waypointdetails_name"
+         android:layout_width="fill_parent"
+         android:layout_height="wrap_content"
+         android:singleLine="true"
+         android:autoText="true"
+         android:capitalize="words"
+         android:selectAllOnFocus="true"
+         android:hint="@string/marker_detail_marker_name"
+         android:imeOptions="actionNext"/>
+      </LinearLayout>
+      <LinearLayout android:id="@+id/waypointdetails_description_layout"
+        android:orientation="vertical"
+        android:layout_width="fill_parent"
+        android:layout_height="0dp"
+        android:visibility="visible"
+        android:layout_weight="1">
+        <TextView android:id="@+id/waypointdetails_category_label"
+          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"
+          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"
+          android:layout_width="fill_parent"
+          android:layout_height="0dp"
+          android:singleLine="false"
+          android:autoText="true"
+          android:capitalize="sentences"
+          android:selectAllOnFocus="true"
+          android:minLines="5"
+          android:maxLines="50"
+          android:gravity="top"
+          android:layout_weight="1"
+          android:hint="@string/marker_detail_marker_description"
+          android:imeOptions="actionDone"/>
+      </LinearLayout>
+
+      <TableLayout android:id="@+id/waypoint_stats"
+        android:visibility="gone"
+        android:padding="2dp"
+        android:layout_height="wrap_content"
+        android:layout_width="fill_parent"
+        android:stretchColumns="1,4">
+        <!-- Total distance and max speed -->
+        <TableRow
+          android:padding="1dp">
+          <TextView
+            android:id="@+id/total_distance_label"
+            android:layout_column="1"
+            android:layout_span="3"
+            android:text="@string/stat_total_distance" />
+          <TextView
+            android:id="@+id/max_speed_label"
+            android:layout_column="4"
+            android:layout_span="2"
+            android:text="@string/stat_max_speed" />
+        </TableRow>
+        <TableRow
+          android:background="@color/stat_label_background">
+          <TextView
+            android:gravity="right"
+            android:id="@+id/total_distance_register"
+            android:layout_column="1"
+            android:layout_marginBottom="-9dp"
+            android:layout_marginTop="-9dp"
+            android:text="@string/value_unknown"
+            android:textColor="@color/stat_label_text"
+            android:textSize="40sp" />
+          <TextView
+            android:gravity="left"
+            android:id="@+id/total_distance_unit_label"
+            android:layout_column="2"
+            android:layout_marginBottom="-9dp"
+            android:layout_marginTop="-9dp"
+            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
+          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="-9dp"
+            android:layout_marginTop="-9dp"
+            android:layout_width="5dp"
+            android:textSize="40sp" />
+          <TextView
+            android:gravity="right"
+            android:id="@+id/max_speed_register"
+            android:layout_column="4"
+            android:layout_marginBottom="-9dp"
+            android:layout_marginTop="-9dp"
+            android:text="@string/value_unknown"
+            android:textColor="@color/stat_label_text"
+            android:textSize="40sp" />
+          <LinearLayout
+            android:gravity="bottom"
+            android:layout_column="5"
+            android:layout_width="wrap_content"
+            android:lines="1"
+            android:orientation="vertical">
+            <TextView
+              android:id="@+id/max_speed_unit_label_top"
+              android:gravity="bottom"
+              android:layout_height="wrap_content"
+              android:layout_marginBottom="-1dp"
+              android:layout_marginTop="-1dp"
+              android:layout_width="wrap_content"
+              android:textColor="@color/stat_label_text" />
+            <TextView
+              android:background="@color/black"
+              android:layout_height="3dp"
+              android:layout_width="fill_parent" />
+            <TextView
+              android:id="@+id/max_speed_unit_label_bottom"
+              android:gravity="bottom"
+              android:layout_height="wrap_content"
+              android:layout_marginBottom="-1dp"
+              android:layout_marginTop="-1dp"
+              android:layout_width="wrap_content"
+              android:textColor="@color/stat_label_text" />
+          </LinearLayout>
+        </TableRow>
+
+        <!-- Total time and average speed -->
+        <TableRow>
+          <TextView
+            android:id="@+id/track_time_label"
+            android:layout_column="1"
+            android:layout_span="3"
+            android:text="@string/stat_total_time" />
+          <TextView
+            android:id="@+id/average_speed_label"
+            android:layout_column="4"
+            android:layout_span="2"
+            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="-9dp"
+            android:layout_marginTop="-9dp"
+            android:layout_span="2"
+            android:layout_width="fill_parent"
+            android:text="@string/value_unknown"
+            android:textColor="@color/stat_label_text"
+            android:textSize="40sp" />
+          <TextView
+            android:background="@color/black"
+            android:layout_column="3"
+            android:layout_marginBottom="-9dp"
+            android:layout_marginTop="-9dp"
+            android:layout_width="5dp"
+            android:textSize="40sp" />
+          <TextView
+            android:gravity="right"
+            android:id="@+id/average_speed_register"
+            android:layout_column="4"
+            android:layout_marginBottom="-9dp"
+            android:layout_marginTop="-9dp"
+            android:text="@string/value_unknown"
+            android:textColor="@color/stat_label_text"
+            android:textSize="40sp" />
+          <LinearLayout
+            android:gravity="bottom"
+            android:layout_column="5"
+            android:layout_width="wrap_content"
+            android:lines="1"
+            android:orientation="vertical">
+            <TextView
+              android:id="@+id/average_speed_unit_label_top"
+              android:gravity="bottom"
+              android:layout_height="wrap_content"
+              android:layout_marginBottom="-1dp"
+              android:layout_marginTop="-1dp"
+              android:layout_width="wrap_content"
+              android:textColor="@color/stat_label_text" />
+            <TextView
+              android:background="@color/black"
+              android:layout_height="3dp"
+              android:layout_width="fill_parent" />
+            <TextView
+              android:id="@+id/average_speed_unit_label_bottom"
+              android:gravity="bottom"
+              android:layout_height="wrap_content"
+              android:layout_marginBottom="-1dp"
+              android:layout_marginTop="-1dp"
+              android:layout_width="wrap_content"
+              android:textColor="@color/stat_label_text" />
+          </LinearLayout>
+        </TableRow>
+
+        <!-- Moving time and average moving speed -->
+        <TableRow>
+          <TextView
+            android:id="@+id/moving_time_label"
+            android:layout_column="1"
+            android:layout_span="3"
+            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/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="-9dp"
+            android:layout_marginTop="-9dp"
+            android:layout_width="fill_parent"
+            android:layout_span="2"
+            android:text="@string/value_unknown"
+            android:textColor="@color/stat_label_text"
+            android:textSize="40sp" />
+          <TextView
+            android:background="@color/black"
+            android:layout_column="3"
+            android:layout_marginBottom="-9dp"
+            android:layout_marginTop="-9dp"
+            android:layout_width="5dp"
+            android:textSize="40sp" />
+          <TextView
+            android:gravity="right"
+            android:id="@+id/average_moving_speed_register"
+            android:layout_column="4"
+            android:layout_marginBottom="-9dp"
+            android:layout_marginTop="-9dp"
+            android:text="@string/value_unknown"
+            android:textColor="@color/stat_label_text"
+            android:textSize="40sp" />
+          <LinearLayout
+            android:gravity="bottom"
+            android:layout_column="5"
+            android:layout_width="wrap_content"
+            android:lines="1"
+            android:orientation="vertical">
+            <TextView
+              android:id="@+id/average_moving_speed_unit_label_top"
+              android:gravity="bottom"
+              android:layout_height="wrap_content"
+              android:layout_marginBottom="-1dp"
+              android:layout_marginTop="-1dp"
+              android:layout_width="wrap_content"
+              android:textColor="@color/stat_label_text" />
+            <TextView
+              android:background="@color/black"
+              android:layout_height="3dp"
+              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="-1dp"
+              android:layout_marginTop="-1dp"
+              android:layout_width="wrap_content"
+              android:textColor="@color/stat_label_text" />
+          </LinearLayout>
+        </TableRow>
+
+        <!-- Elevation and elevation gain -->
+        <TableRow>
+          <TextView
+            android:id="@+id/elevation_label"
+            android:layout_column="1"
+            android:layout_span="3"
+            android:text="@string/stat_elevation" />
+          <TextView
+            android:id="@+id/elevation_gain_label"
+            android:layout_column="4"
+            android:layout_span="2"
+            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="-9dp"
+            android:layout_marginTop="-9dp"
+            android:text="@string/value_unknown"
+            android:textColor="@color/stat_label_text"
+            android:textSize="40sp" />
+          <TextView
+            android:gravity="left"
+            android:id="@+id/elevation_unit_label"
+            android:layout_column="2"
+            android:layout_marginBottom="-9dp"
+            android:layout_marginTop="-9dp"
+            android:text="@string/unit_feet"
+            android:textColor="@color/stat_label_text"/>
+          <TextView
+            android:background="@color/black"
+            android:layout_column="3"
+            android:layout_marginBottom="-9dp"
+            android:layout_marginTop="-9dp"
+            android:layout_width="5dp"
+            android:textSize="40sp" />
+          <TextView
+            android:gravity="right"
+            android:id="@+id/elevation_gain_register"
+            android:layout_column="4"
+            android:layout_marginBottom="-9dp"
+            android:layout_marginTop="-9dp"
+            android:text="@string/value_unknown"
+            android:textColor="@color/stat_label_text"
+            android:textSize="40sp" />
+          <TextView
+            android:gravity="left"
+            android:id="@+id/elevation_gain_unit_label"
+            android:layout_column="5"
+            android:layout_marginBottom="-9dp"
+            android:layout_marginTop="-9dp"
+            android:text="@string/unit_feet"
+            android:textColor="@color/stat_label_text" />
+        </TableRow>
+
+        <!-- Min and max elevation -->
+        <TableRow>
+          <TextView
+            android:id="@+id/min_elevation_label"
+            android:layout_column="1"
+            android:layout_span="3"
+            android:text="@string/stat_min_elevation" />
+          <TextView
+            android:id="@+id/max_elevation_label"
+            android:layout_column="4"
+            android:layout_span="3"
+            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="-9dp"
+            android:layout_marginTop="-9dp"
+            android:text="@string/value_unknown"
+            android:textColor="@color/stat_label_text"
+            android:textSize="40sp" />
+          <TextView
+            android:gravity="left"
+            android:id="@+id/min_elevation_unit_label"
+            android:layout_column="2"
+            android:layout_marginBottom="-9dp"
+            android:layout_marginTop="-9dp"
+            android:text="@string/unit_feet"
+            android:textColor="@color/stat_label_text" />
+          <TextView
+            android:background="@color/black"
+            android:layout_column="3"
+            android:layout_marginBottom="-9dp"
+            android:layout_marginTop="-9dp"
+            android:layout_width="5dp"
+            android:textSize="40sp" />
+          <TextView
+            android:gravity="right"
+            android:id="@+id/max_elevation_register"
+            android:layout_column="4"
+            android:layout_marginBottom="-9dp"
+            android:layout_marginTop="-9dp"
+            android:text="@string/value_unknown"
+            android:textColor="@color/stat_label_text"
+            android:textSize="40sp" />
+          <TextView
+            android:id="@+id/max_elevation_unit_label"
+            android:gravity="left"
+            android:layout_column="5"
+            android:layout_marginBottom="-9dp"
+            android:layout_marginTop="-9dp"
+            android:text="@string/unit_feet"
+            android:textColor="@color/stat_label_text" />
+        </TableRow>
+
+        <!-- Min and max grade -->
+        <TableRow>
+          <TextView
+            android:id="@+id/min_grade_label"
+            android:layout_column="1"
+            android:layout_span="3"
+            android:text="@string/stat_min_grade" />
+          <TextView
+            android:id="@+id/max_grade_label"
+            android:layout_column="4"
+            android:layout_span="2"
+            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="-9dp"
+            android:layout_marginTop="-9dp"
+            android:layout_width="fill_parent"
+            android:layout_span="2"
+            android:text="@string/value_unknown"
+            android:textColor="@color/stat_label_text"
+            android:textSize="40sp" />
+          <TextView
+            android:background="@color/black"
+            android:layout_column="3"
+            android:layout_marginBottom="-9dp"
+            android:layout_marginTop="-9dp"
+            android:layout_width="5dp"
+            android:textSize="40sp" />
+          <TextView
+            android:gravity="right"
+            android:id="@+id/max_grade_register"
+            android:layout_column="4"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="-9dp"
+            android:layout_marginTop="-9dp"
+            android:layout_width="fill_parent"
+            android:layout_span="2"
+            android:text="@string/value_unknown"
+            android:textColor="@color/stat_label_text"
+            android:textSize="40sp" />
+        </TableRow>
+      </TableLayout>
+    </LinearLayout>
+  </ScrollView>
+  <LinearLayout style="@style/ButtonLayout">
+    <LinearLayout style="@style/ButtonSpacer"/>
+    <Button android:id="@+id/waypointdetails_save"
+      android:layout_gravity="left"
+      android:text="@string/generic_save"
+      style="@style/Button"/>
+    <Button android:id="@+id/waypointdetails_cancel"
+      android:layout_gravity="right"
+      android:text="@string/generic_cancel"
+      style="@style/Button"/>
+    <LinearLayout style="@style/ButtonSpacer"/>
+  </LinearLayout>
+</LinearLayout>

MyTracks/res/layout/mytracks_waypoints_list.xml

@@ -0,0 +1,55 @@
+<?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"
+  xmlns:app="http://schemas.android.com/apl/res/com.google.android.apps.mytracks"
+  android:id="@+id/waypointslist_root"
+  android:orientation="vertical"
+  android:layout_width="fill_parent"
+  android:layout_height="fill_parent">
+  <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="3dp">
+    <TextView android:id="@+id/message"
+      android:layout_width="0dp"
+      android:layout_height="wrap_content"
+      android:textSize="16dp"
+      android:textColor="#fff"
+      android:text="@string/marker_list_pick_one"
+      android:layout_weight="1"/>
+  </LinearLayout>
+
+  <ListView android:id="@android:id/list"
+    android:layout_width="fill_parent"
+    android:layout_height="wrap_content"
+    android:layout_weight="1"/>
+  <LinearLayout style="@style/ButtonLayout">
+    <LinearLayout style="@style/ButtonSpacer"/>
+    <Button android:id="@+id/waypointslist_btn_insert_statistics"
+      android:layout_gravity="left"
+      android:text="@string/marker_list_insert_statistics"
+      style="@style/Button"/>
+    <Button android:id="@+id/waypointslist_btn_insert_waypoint"
+      android:layout_gravity="right"
+      android:text="@string/marker_list_insert_waypoint"
+      style="@style/Button"/>
+    <LinearLayout style="@style/ButtonSpacer"/>
+  </LinearLayout>
+</LinearLayout>

MyTracks/res/layout/search_list.xml

@@ -0,0 +1,34 @@
+<?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"
+  xmlns:app="http://schemas.android.com/apl/res/com.google.android.apps.mytracks"
+  android:orientation="vertical"
+  android:layout_width="fill_parent"
+  android:layout_height="fill_parent">
+  <ListView android:id="@android:id/list"
+    android:layout_height="fill_parent"
+    android:layout_width="fill_parent" />
+  <TextView android:id="@android:id/empty"
+    android:gravity="center"
+    android:layout_height="fill_parent"
+    android:layout_width="fill_parent"
+    android:text="@string/search_no_results"
+    android:textColor="@android:color/white"
+    android:textSize="20dp"
+    android:textStyle="bold"
+    android:visibility="gone" />
+</LinearLayout>

MyTracks/res/layout/sensor_state.xml

@@ -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>

MyTracks/res/layout/stats.xml

@@ -0,0 +1,364 @@
+<?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/stats_root"
+  android:layout_height="wrap_content"
+  android:orientation="horizontal"
+  android:layout_width="fill_parent">
+
+  <ScrollView
+    android:id="@+id/scrolly"
+    android:layout_height="wrap_content"
+    android:layout_width="fill_parent">
+
+    <TableLayout
+      android:id="@+id/stats_table"
+      android:layout_height="wrap_content"
+      android:stretchColumns="1,4"
+      android:layout_width="fill_parent">
+
+      <!--  Layout the speed large on it's own line. -->
+      <TableRow>
+        <TextView
+          android:id="@+id/speed_label"
+          android:layout_span="5"
+          android:text="@string/stat_speed" />
+      </TableRow>
+      <TableRow
+        android:background="@color/stat_label_background">
+        <TextView
+          style="@style/StatsRegister.Big"
+          android:id="@+id/speed_register"
+          android:layout_column="1"
+          android:layout_span="4"/>
+        <LinearLayout
+          android:gravity="bottom"
+          android:layout_column="5"
+          android:layout_width="wrap_content"
+          android:lines="1"
+          android:orientation="vertical">
+          <TextView
+            android:layout_height="fill_parent"
+            android:layout_width="fill_parent" />
+          <TextView
+            android:id="@+id/speed_unit_label_top"
+	          style="@style/StatsUnit" />
+          <TextView
+	          style="@style/StatsDivider" />
+          <TextView
+            android:id="@+id/speed_unit_label_bottom"
+	          style="@style/StatsUnit" />
+        </LinearLayout>
+      </TableRow>
+
+      <!-- Total distance and max speed -->
+      <TableRow
+        android:padding="1dp">
+        <TextView
+          android:id="@+id/total_distance_label"
+          android:layout_column="1"
+          android:layout_span="3"
+          android:text="@string/stat_total_distance" />
+        <TextView
+          android:id="@+id/max_speed_label"
+          android:layout_column="4"
+          android:layout_span="2"
+          android:text="@string/stat_max_speed" />
+      </TableRow>
+      <TableRow
+        android:background="@color/stat_label_background">
+        <TextView
+          style="@style/StatsRegister"
+          android:id="@+id/total_distance_register"
+          android:layout_column="1" />
+        <TextView
+          android:id="@+id/total_distance_unit_label"
+          android:layout_column="2"
+	        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
+          style="@style/StatsSpacer"
+          android:layout_column="3"/>
+        <TextView
+          android:id="@+id/max_speed_register"
+          style="@style/StatsRegister"
+          android:layout_column="4" />
+        <LinearLayout
+          android:gravity="bottom"
+          android:layout_column="5"
+          android:layout_width="wrap_content"
+          android:lines="1"
+          android:orientation="vertical">
+          <TextView
+            android:id="@+id/max_speed_unit_label_top"
+            style="@style/StatsUnit" />
+          <TextView
+	          style="@style/StatsDivider" />
+          <TextView
+            android:id="@+id/max_speed_unit_label_bottom"
+            style="@style/StatsUnit" />
+        </LinearLayout>
+      </TableRow>
+
+      <!-- Total time and average speed -->
+      <TableRow>
+        <TextView
+          android:id="@+id/track_time_label"
+          android:layout_column="1"
+          android:layout_span="3"
+          android:text="@string/stat_total_time" />
+        <TextView
+          android:id="@+id/average_speed_label"
+          android:layout_column="4"
+          android:layout_span="2"
+          android:text="@string/stat_average_speed" />
+      </TableRow>
+      <TableRow
+        android:background="@color/stat_label_background">
+        <TextView
+          android:id="@+id/total_time_register"
+          android:layout_column="1"
+          android:layout_height="wrap_content"
+          android:layout_span="2"
+          android:layout_width="fill_parent"
+          style="@style/StatsRegister" />
+        <TextView
+          style="@style/StatsSpacer"
+          android:layout_column="3"/>
+        <TextView
+          android:id="@+id/average_speed_register"
+          android:layout_column="4"
+          style="@style/StatsRegister" />
+        <LinearLayout
+          android:gravity="bottom"
+          android:layout_column="5"
+          android:layout_width="wrap_content"
+          android:lines="1"
+          android:orientation="vertical">
+          <TextView
+            android:id="@+id/average_speed_unit_label_top"
+            style="@style/StatsUnit" />
+          <TextView
+	          style="@style/StatsDivider" />
+          <TextView
+            android:id="@+id/average_speed_unit_label_bottom"
+            style="@style/StatsUnit" />
+        </LinearLayout>
+      </TableRow>
+
+      <!-- Moving time and average moving speed -->
+      <TableRow>
+        <TextView
+          android:id="@+id/moving_time_label"
+          android:layout_column="1"
+          android:layout_span="3"
+          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/stat_average_moving_speed" />
+      </TableRow>
+      <TableRow
+        android:background="@color/stat_label_background">
+        <TextView
+          android:id="@+id/moving_time_register"
+          android:layout_column="1"
+          android:layout_height="wrap_content"
+          android:layout_span="2"
+          android:layout_width="fill_parent"
+          style="@style/StatsRegister" />
+        <TextView
+          style="@style/StatsSpacer"
+          android:layout_column="3"/>
+        <TextView
+          android:id="@+id/average_moving_speed_register"
+          style="@style/StatsRegister" />
+        <LinearLayout
+          android:gravity="bottom"
+          android:layout_column="5"
+          android:layout_width="wrap_content"
+          android:lines="1"
+          android:orientation="vertical">
+          <TextView
+            android:id="@+id/average_moving_speed_unit_label_top"
+            style="@style/StatsUnit" />
+          <TextView
+	          style="@style/StatsDivider" />
+            android:layout_height="3dp"
+            android:layout_width="fill_parent" />
+          <TextView
+            android:id="@+id/average_moving_speed_unit_label_bottom"
+            style="@style/StatsUnit" />
+        </LinearLayout>
+      </TableRow>
+
+      <!-- Elevation and elevation gain -->
+      <TableRow>
+        <TextView
+          android:id="@+id/elevation_label"
+          android:layout_column="1"
+          android:layout_span="3"
+          android:text="@string/stat_elevation" />
+        <TextView
+          android:id="@+id/elevation_gain_label"
+          android:layout_column="4"
+          android:layout_span="2"
+          android:text="@string/stat_elevation_gain" />
+      </TableRow>
+      <TableRow
+        android:background="@color/stat_label_background">
+        <TextView
+          android:id="@+id/elevation_register"
+          android:layout_column="1"
+          style="@style/StatsRegister" />
+        <TextView
+          android:id="@+id/elevation_unit_label"
+          android:layout_column="2"
+          style="@style/StatsUnitSolo" />
+        <TextView
+          style="@style/StatsSpacer"
+          android:layout_column="3"/>
+        <TextView
+          android:id="@+id/elevation_gain_register"
+          android:layout_column="4"
+          style="@style/StatsRegister" />
+        <TextView
+          android:id="@+id/elevation_gain_unit_label"
+          android:layout_column="5"
+          style="@style/StatsUnitSolo" />
+      </TableRow>
+
+      <!-- Min and max elevation -->
+      <TableRow>
+        <TextView
+          android:id="@+id/min_elevation_label"
+          android:layout_column="1"
+          android:layout_span="3"
+          android:text="@string/stat_min_elevation" />
+        <TextView
+          android:id="@+id/max_elevation_label"
+          android:layout_column="4"
+          android:layout_span="3"
+          android:text="@string/stat_max_elevation" />
+      </TableRow>
+      <TableRow
+        android:background="@color/stat_label_background">
+        <TextView
+          android:id="@+id/min_elevation_register"
+          android:layout_column="1"
+          style="@style/StatsRegister" />
+        <TextView
+          android:id="@+id/min_elevation_unit_label"
+          android:layout_column="2"
+          style="@style/StatsUnitSolo" />
+        <TextView
+          style="@style/StatsSpacer"
+          android:layout_column="3"/>
+        <TextView
+          android:id="@+id/max_elevation_register"
+          android:layout_column="4"
+          style="@style/StatsRegister" />
+        <TextView
+          android:id="@+id/max_elevation_unit_label"
+          android:layout_column="5"
+          style="@style/StatsUnitSolo" />
+      </TableRow>
+
+      <!-- Min and max grade -->
+      <TableRow>
+        <TextView
+          android:id="@+id/min_grade_label"
+          android:layout_column="1"
+          android:layout_span="3"
+          android:text="@string/stat_min_grade" />
+        <TextView
+          android:id="@+id/max_grade_label"
+          android:layout_column="4"
+          android:layout_span="2"
+          android:text="@string/stat_max_grade" />
+      </TableRow>
+      <TableRow
+        android:background="@color/stat_label_background">
+        <TextView
+          android:id="@+id/min_grade_register"
+          android:layout_column="1"
+          android:layout_span="2"
+          style="@style/StatsRegister" />
+        <TextView
+          style="@style/StatsSpacer"
+          android:layout_column="3"/>
+        <TextView
+          android:id="@+id/max_grade_register"
+          android:layout_column="4"
+          android:layout_span="2"
+          style="@style/StatsRegister" />
+      </TableRow>
+
+      <!-- Latitude and Longitude -->
+      <TableRow>
+        <TextView
+          android:layout_column="1"
+          android:layout_span="3"
+          android:text="@string/stat_latitude" />
+        <TextView
+          android:layout_column="4"
+          android:layout_span="2"
+          android:text="@string/stat_longitude" />
+      </TableRow>
+      <TableRow
+        android:background="@color/stat_label_background">
+        <TextView
+          android:id="@+id/latitude_register"
+          android:layout_column="1"
+          android:layout_span="2"
+          style="@style/StatsRegister.Small" />
+        <TextView
+          style="@style/StatsSpacer"
+          android:layout_column="3"
+          android:textSize="25sp" />
+        <TextView
+          android:id="@+id/longitude_register"
+          android:layout_column="4"
+          android:layout_span="2"
+          style="@style/StatsRegister.Small" />
+      </TableRow>
+
+    </TableLayout>
+  </ScrollView>
+  <LinearLayout android:id="@+id/stats_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/track_detail.xml

@@ -0,0 +1,113 @@
+<?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:contentDescription="@string/track_icon_description"
+          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>

MyTracks/res/layout/track_widget.xml

@@ -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="10dp"
+  android:paddingRight="10dp"
+  android:paddingTop="5dp"
+  android:paddingBottom="5dp">
+  <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="10dp"
+      android:paddingRight="10dp"
+      android:src="@drawable/appwidget_button_disabled" />
+    <LinearLayout
+      android:id="@+id/appwidget_track_statistics"
+      android:layout_height="fill_parent"
+      android:layout_width="0dp"
+      android:layout_weight="1"
+      android:clickable="true"
+      android:orientation="vertical"
+      android:paddingLeft="15dp">
+      <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="1dp"
+        android:background="@color/appwidget_hr" />
+      <LinearLayout
+        android:layout_height="wrap_content"
+        android:layout_width="fill_parent"
+        android:orientation="horizontal"
+        android:paddingBottom="2dp">
+        <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="1dp"
+        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>

MyTracks/res/layout/upload_result.xml

@@ -0,0 +1,131 @@
+<?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.
+-->
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+  android:layout_height="fill_parent"
+  android:layout_margin="8dp"
+  android:layout_width="fill_parent" >
+  <LinearLayout
+    android:layout_height="wrap_content"
+    android:layout_width="fill_parent"
+    android:orientation="vertical" >
+    <!-- Google Maps result -->
+    <LinearLayout
+      android:id="@+id/upload_result_maps_result"
+      android:layout_height="wrap_content"
+      android:layout_width="wrap_content"
+      android:orientation="horizontal" >
+      <ImageView
+        android:contentDescription="@string/generic_success_title"
+        android:id="@+id/upload_result_maps_result_icon"
+        android:layout_gravity="center_vertical"
+        android:layout_height="wrap_content"
+        android:layout_width="wrap_content"
+        android:src="@drawable/success" />
+      <LinearLayout
+        android:layout_height="wrap_content"
+        android:layout_width="wrap_content"
+        android:orientation="vertical"
+        android:paddingLeft="8dp" >
+        <TextView
+          android:layout_height="wrap_content"
+          android:layout_width="wrap_content"
+          android:text="@string/send_google_maps"
+          style="@android:style/TextAppearance.DeviceDefault.Medium" />
+        <TextView
+          android:layout_height="wrap_content"
+          android:layout_width="wrap_content"
+          android:text="@string/send_google_maps_url"
+          style="@android:style/TextAppearance.DeviceDefault.Small" />
+      </LinearLayout>
+    </LinearLayout>
+    <!-- Google Fusion Tables result -->
+    <LinearLayout
+      android:id="@+id/upload_result_fusion_tables_result"
+      android:layout_height="wrap_content"
+      android:layout_width="wrap_content"
+      android:orientation="horizontal" >
+      <ImageView
+        android:contentDescription="@string/generic_success_title"
+        android:id="@+id/upload_result_fusion_tables_result_icon"
+        android:layout_gravity="center_vertical"
+        android:layout_height="wrap_content"
+        android:layout_width="wrap_content"
+        android:src="@drawable/success" />
+      <LinearLayout
+        android:layout_height="wrap_content"
+        android:layout_width="wrap_content"
+        android:orientation="vertical"
+        android:paddingLeft="8dp" >
+        <TextView
+          android:layout_height="wrap_content"
+          android:layout_width="wrap_content"
+          android:text="@string/send_google_fusion_tables"
+          style="@android:style/TextAppearance.DeviceDefault.Medium" />
+        <TextView
+          android:layout_height="wrap_content"
+          android:layout_width="wrap_content"
+          android:text="@string/send_google_fusion_tables_url"
+          style="@android:style/TextAppearance.DeviceDefault.Small" />
+      </LinearLayout>
+    </LinearLayout>
+    <!-- Google Docs result -->
+    <LinearLayout
+      android:id="@+id/upload_result_docs_result"
+      android:layout_height="wrap_content"
+      android:layout_width="wrap_content"
+      android:orientation="horizontal" >
+      <ImageView
+        android:contentDescription="@string/generic_success_title"
+        android:id="@+id/upload_result_docs_result_icon"
+        android:layout_gravity="center_vertical"
+        android:layout_height="wrap_content"
+        android:layout_width="wrap_content"
+        android:src="@drawable/success" />
+      <LinearLayout
+        android:layout_height="wrap_content"
+        android:layout_width="wrap_content"
+        android:orientation="vertical"
+        android:paddingLeft="8dp" >
+        <TextView
+          android:layout_height="wrap_content"
+          android:layout_width="wrap_content"
+          android:text="@string/send_google_docs"
+          style="@android:style/TextAppearance.DeviceDefault.Medium" />
+        <TextView
+          android:layout_height="wrap_content"
+          android:layout_width="wrap_content"
+          android:text="@string/send_google_docs_url"
+          style="@android:style/TextAppearance.DeviceDefault.Small" />
+      </LinearLayout>
+    </LinearLayout>
+    <!-- Footer -->
+    <TextView
+      android:id="@+id/upload_result_success_footer"
+      android:layout_height="wrap_content"
+      android:layout_width="wrap_content"
+      android:padding="8dp"
+      android:text="@string/send_google_success_footer"
+      style="@android:style/TextAppearance.DeviceDefault.Small" />
+    <TextView
+      android:id="@+id/upload_result_error_footer"
+      android:layout_height="wrap_content"
+      android:layout_width="wrap_content"
+      android:padding="8dp"
+      android:text="@string/send_google_error"
+      style="@android:style/TextAppearance.DeviceDefault.Medium" />
+  </LinearLayout>
+</ScrollView>

MyTracks/res/layout/upload_service_chooser.xml

@@ -0,0 +1,105 @@
+<?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" >
+
+  <TableLayout
+    android:layout_height="wrap_content"
+    android:layout_margin="8dp"
+    android:layout_width="fill_parent"
+    android:stretchColumns="1" >
+
+    <TableRow android:id="@+id/send_google_maps_row" >
+
+      <ImageView
+        android:contentDescription="@string/send_google_maps"
+        android:layout_height="wrap_content"
+        android:layout_width="wrap_content"
+        android:src="@drawable/maps_icon" />
+
+      <CheckBox
+        android:id="@+id/send_google_maps"
+        android:layout_gravity="center_vertical"
+        android:layout_height="wrap_content"
+        android:layout_marginLeft="8dp"
+        android:layout_width="0dp"
+        style="@android:style/TextAppearance.DeviceDefault.Medium"
+        android:text="@string/send_google_maps" />
+    </TableRow>
+
+    <TableRow android:id="@+id/send_google_maps_option_row" >
+
+      <RadioGroup
+        android:layout_column="1"
+        android:layout_height="wrap_content"
+        android:layout_marginLeft="8dp"
+        android:layout_width="0dp" >
+
+        <RadioButton
+          android:id="@+id/send_google_new_map"
+          android:layout_height="wrap_content"
+          android:layout_width="wrap_content"
+          style="@android:style/TextAppearance.DeviceDefault.Medium"
+          android:text="@string/send_google_new_map" />
+
+        <RadioButton
+          android:id="@+id/send_google_existing_map"
+          android:layout_height="wrap_content"
+          android:layout_width="wrap_content"
+          style="@android:style/TextAppearance.DeviceDefault.Medium"
+          android:text="@string/send_google_existing_map" />
+      </RadioGroup>
+    </TableRow>
+
+    <TableRow android:id="@+id/send_google_fusion_tables_row" >
+
+      <ImageView
+        android:contentDescription="@string/send_google_fusion_tables"
+        android:layout_height="wrap_content"
+        android:layout_width="wrap_content"
+        android:src="@drawable/googledocs_icon" />
+
+      <CheckBox
+        android:id="@+id/send_google_fusion_tables"
+        android:layout_gravity="center_vertical"
+        android:layout_height="wrap_content"
+        android:layout_marginLeft="8dp"
+        android:layout_width="0dp"
+        style="@android:style/TextAppearance.DeviceDefault.Medium"
+        android:text="@string/send_google_fusion_tables" />
+    </TableRow>
+    <TableRow android:id="@+id/send_google_docs_row" >
+
+      <ImageView
+        android:contentDescription="@string/send_google_docs"
+        android:layout_height="wrap_content"
+        android:layout_width="wrap_content"
+        android:src="@drawable/googledocs_icon" />
+
+      <CheckBox
+        android:id="@+id/send_google_docs"
+        android:layout_gravity="center_vertical"
+        android:layout_height="fill_parent"
+        android:layout_marginLeft="8dp"
+        android:layout_width="0dp"
+        style="@android:style/TextAppearance.DeviceDefault.Medium"
+        android:text="@string/send_google_docs" />
+    </TableRow>
+  </TableLayout>
+
+</ScrollView>

MyTracks/res/layout/welcome.xml

@@ -0,0 +1,155 @@
+<?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/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: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/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_maps_sharing_question"
+        style="@style/WelcomeTextView.Question"/>
+      <TextView
+        android:text="@string/welcome_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_gravity="right"
+      android:text="@string/welcome_about"
+      style="@style/Button"/>
+    <LinearLayout style="@style/ButtonSpacer"/>
+  </LinearLayout>
+</LinearLayout>

MyTracks/res/menu/main.xml

@@ -0,0 +1,92 @@
+<?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.
+-->
+<menu xmlns:android="http://schemas.android.com/apk/res/android" >
+
+  <item
+    android:icon="@drawable/ic_menu_recordtrack"
+    android:id="@+id/menu_record_track"
+    android:showAsAction="always"
+    android:title="@string/menu_record_track"/>
+
+  <item
+    android:icon="@drawable/ic_menu_stoprecording"
+    android:id="@+id/menu_stop_recording"
+    android:showAsAction="always"
+    android:title="@string/menu_stop_recording"/>
+
+  <item
+    android:icon="@drawable/ic_menu_tracklist"
+    android:id="@+id/menu_tracks"
+    android:showAsAction="ifRoom"
+    android:title="@string/menu_tracks"/>
+
+  <item
+    android:icon="@drawable/ic_menu_waypoints"
+    android:id="@+id/menu_markers"
+    android:showAsAction="ifRoom"
+    android:title="@string/menu_markers"/>
+
+  <item
+    android:icon="@drawable/ic_menu_chartsettings"
+    android:id="@+id/menu_chart_settings"
+    android:showAsAction="ifRoom"
+    android:title="@string/menu_chart_view_chart_settings"
+    android:visible="false"/>
+
+  <item
+    android:icon="@android:drawable/ic_menu_mylocation"
+    android:id="@+id/menu_my_location"
+    android:showAsAction="ifRoom"
+    android:title="@string/menu_map_view_my_location"
+    android:visible="false"/>
+
+  <item
+    android:icon="@android:drawable/ic_menu_mapmode"
+    android:id="@+id/menu_satellite_mode"
+    android:showAsAction="ifRoom"
+    android:title="@string/menu_map_view_satellite_mode"
+    android:visible="false"/>
+
+  <item
+    android:icon="@android:drawable/ic_menu_search"
+    android:id="@+id/menu_search"
+    android:title="@string/menu_search"/>
+
+  <item
+    android:icon="@drawable/ic_menu_sensorstatus"
+    android:id="@+id/menu_sensor_state"
+    android:orderInCategory="1000"
+    android:title="@string/menu_sensor_state"/>
+
+  <item
+    android:icon="@android:drawable/ic_menu_preferences"
+    android:id="@+id/menu_settings"
+    android:orderInCategory="1001"
+    android:title="@string/menu_settings"/>
+
+  <item
+    android:id="@+id/menu_aggregated_statistics"
+    android:orderInCategory="1002"
+    android:title="@string/menu_aggregated_statistics"/>
+
+  <item
+    android:icon="@android:drawable/ic_menu_info_details"
+    android:id="@+id/menu_help"
+    android:orderInCategory="1003"
+    android:title="@string/menu_help"/>
+
+</menu>

MyTracks/res/menu/search_only.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.
+-->
+<menu xmlns:android="http://schemas.android.com/apk/res/android" >
+
+  <item
+    android:icon="@android:drawable/ic_menu_search"
+    android:id="@+id/menu_search"
+    android:onClick="onSearch"
+    android:showAsAction="always"
+    android:title="@string/menu_search"/>
+
+</menu>