Issue 45: Add ImportAllTracks to import GPX files from /sdcard/MyTracks/gpx

ImportAllTracks is essentially just a modification of ExportAllTracks that uses the existing GpxImporter to import all GPX files found in /sdcard/MyTracks/gpx. So that the import functionality can always be accessed, the MyTracks Activity's MenuManager is altered so that the Tracks button shows regardless of whether there are any tracks in the database (ImportAllTracks is launched by a button in the lower right of the MyTracksList activity). A Toast message shows if no GPX files are found; this serves as a hint to users on where to put GPX files for import so that this addition should be discoverable and useable without documentation. Im
2011-02-13 22:15:48 +00:00
commit 59a05262a1
366 changed files with 47907 additions and 0 deletions
@@ -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>
@@ -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>
@@ -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>
@@ -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>
@@ -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>
@@ -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>
@@ -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>
@@ -0,0 +1,147 @@
+<?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.
+-->
+<TableLayout
+  xmlns:android="http://schemas.android.com/apk/res/android"
+  android:layout_height="wrap_content"
+  android:layout_width="wrap_content"
+  android:stretchColumns="2">
+  <TableRow>
+    <ImageView
+      android:layout_column="1"
+      android:src="@drawable/arrow_icon" />
+    <LinearLayout
+      android:layout_column="2"
+      android:layout_height="wrap_content"
+      android:layout_width="wrap_content"
+      android:orientation="vertical">
+      <TextView
+        android:layout_height="wrap_content"
+        android:layout_width="wrap_content"
+        android:text="@string/app_name"
+        android:textSize="30sp" />
+      <TextView
+        android:layout_height="wrap_content"
+        android:layout_width="wrap_content"
+        android:text="@string/about_copyright_message"
+        android:textSize="15sp" />
+    </LinearLayout>
+  </TableRow>
+
+  <View android:layout_height="2dip" />
+
+  <TableRow>
+    <TextView
+      android:paddingLeft="10dip"
+      android:paddingRight="10dip"
+      android:layout_column="1"
+      android:layout_height="wrap_content"
+      android:layout_width="wrap_content"
+      android:text="@string/about_team"
+      android:textSize="20sp" />
+    <LinearLayout
+      android:layout_column="2"
+      android:layout_height="wrap_content"
+      android:layout_width="wrap_content"
+      android:orientation="vertical">
+      <TextView
+        android:layout_height="wrap_content"
+        android:layout_width="wrap_content"
+        android:text="@string/about_bart"
+        android:textSize="20sp" />
+      <TextView
+        android:layout_height="wrap_content"
+        android:layout_width="wrap_content"
+        android:text="@string/about_dylan"
+        android:textSize="20sp" />
+      <TextView
+        android:layout_height="wrap_content"
+        android:layout_width="wrap_content"
+        android:text="@string/about_leif"
+        android:textSize="20sp" />
+      <TextView
+        android:layout_height="wrap_content"
+        android:layout_width="wrap_content"
+        android:text="@string/about_rdamazio"
+        android:textSize="20sp" />
+      <TextView
+        android:layout_height="wrap_content"
+        android:layout_width="wrap_content"
+        android:text="@string/about_sandor"
+        android:textSize="20sp" />
+    </LinearLayout>
+  </TableRow>
+
+  <View android:layout_height="2dip" />
+
+  <TableRow>
+    <TextView
+      android:paddingLeft="10dip"
+      android:paddingRight="10dip"
+      android:layout_column="1"
+      android:layout_height="wrap_content"
+      android:layout_width="wrap_content"
+      android:text="@string/about_version"
+      android:textSize="20sp" />
+    <TextView
+      android:layout_height="wrap_content"
+      android:id="@+id/about_version_register"
+      android:layout_width="wrap_content"
+      android:text="@string/unknown"
+      android:textSize="20sp" />
+  </TableRow>
+
+  <View android:layout_height="2dip" />
+
+  <TableRow>
+    <TextView
+      android:paddingLeft="10dip"
+      android:paddingRight="10dip"
+      android:layout_column="1"
+      android:layout_height="wrap_content"
+      android:layout_width="wrap_content"
+      android:text="@string/about_support"
+      android:textSize="20sp" />
+    <TextView
+      android:autoLink="web"
+      android:layout_height="wrap_content"
+      android:layout_width="wrap_content"
+      android:text="@string/about_weburl"
+      android:textSize="18sp" />
+  </TableRow>
+
+  <View android:layout_height="2dip" />
+  
+  <TableRow>
+    <TextView
+      android:paddingLeft="10dip"
+      android:paddingRight="10dip"
+      android:layout_column="1"
+      android:layout_height="wrap_content"
+      android:layout_width="wrap_content"
+      android:text="@string/about_privacy"
+      android:textSize="20sp" />
+    <TextView
+      android:autoLink="web"
+      android:layout_height="wrap_content"
+      android:layout_width="wrap_content"
+      android:text="@string/about_privacy_weburl"
+      android:textSize="18sp" />
+  </TableRow>
+  
+  <View android:layout_height="4dip" />
+
+</TableLayout>
@@ -0,0 +1,148 @@
+<?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.
+-->
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+  android:id="@+id/screen"
+  android:layout_width="200dip"
+  android:layout_height="fill_parent"
+  android:orientation="vertical">
+  <LinearLayout
+    android:layout_width="fill_parent"
+    android:layout_height="wrap_content"
+    android:background="@drawable/list_bar">
+    <TextView
+      android:layout_width="fill_parent"
+      android:layout_height="wrap_content"
+      android:text="@string/chart_settings"
+      android:textSize="20dip"
+      android:textColor="#fff"
+      android:layout_marginLeft="10dip"/>
+  </LinearLayout>
+  <ScrollView
+    android:layout_width="fill_parent"
+    android:layout_height="wrap_content"
+    android:layout_weight="1">
+    <TableLayout
+      android:layout_width="fill_parent"
+      android:layout_height="wrap_content"
+      android:stretchColumns="1"
+      android:layout_marginTop="5dip"
+      android:layout_marginLeft="5dip">
+      <TableRow>
+        <LinearLayout
+          android:layout_width="fill_parent"
+          android:layout_height="wrap_content"
+          android:orientation="vertical"
+          android:layout_marginLeft="10dip">
+          <LinearLayout
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal">
+            <ImageView android:src="@drawable/x_axis"
+              android:layout_width="wrap_content"
+              android:layout_height="wrap_content"/>
+            <TextView
+              android:layout_width="fill_parent"
+              android:layout_height="wrap_content"
+              android:text="@string/x_axis"
+              android:textSize="20dip" />
+          </LinearLayout>
+          <RadioGroup  android:id="@+id/chart_settings_x"
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content">
+            <RadioButton android:id="@+id/chart_settings_by_distance"
+              android:layout_width="fill_parent"
+              android:layout_height="wrap_content"
+              android:text="@string/by_distance"/>
+            <RadioButton android:id="@+id/chart_settings_by_time"
+              android:layout_width="fill_parent"
+              android:layout_height="wrap_content"
+              android:text="@string/by_time"/>
+          </RadioGroup>
+        </LinearLayout>
+      </TableRow>
+      <TableRow>
+        <LinearLayout
+          android:layout_width="fill_parent"
+          android:layout_height="wrap_content"
+          android:orientation="vertical"
+          android:layout_marginLeft="10dip">
+          <LinearLayout
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal">
+            <ImageView android:src="@drawable/y_axis"
+              android:layout_width="wrap_content"
+              android:layout_height="wrap_content"/>
+            <TextView
+              android:layout_width="fill_parent"
+              android:layout_height="wrap_content"
+              android:text="@string/y_axis"
+              android:textSize="20dip" />
+          </LinearLayout>
+          <CheckBox android:id="@+id/chart_settings_elevation"
+            android:checked="true"
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:text="@string/elevation"/>
+          <CheckBox android:id="@+id/chart_settings_speed"
+            android:checked="true"
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:text="@string/speed"/>
+          <CheckBox android:id="@+id/chart_settings_power"
+            android:checked="true"
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:text="@string/power"/>
+          <CheckBox android:id="@+id/chart_settings_cadence"
+            android:checked="true"
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:text="@string/cadence"/>
+          <CheckBox android:id="@+id/chart_settings_heart_rate"
+            android:checked="true"
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:text="@string/heart_rate"/>
+        </LinearLayout>
+      </TableRow>
+    </TableLayout>
+  </ScrollView>
+  <LinearLayout
+    android:orientation="horizontal"
+    android:layout_width="fill_parent"
+    android:layout_height="wrap_content"
+    android:background="@drawable/list_bar"
+    android:padding="3dip">
+    <Button android:id="@+id/chart_settings_cancel"
+      android:layout_width="wrap_content"
+      android:layout_height="48dip"
+      android:layout_gravity="right"
+      android:text="@string/cancel"
+      android:textSize="14dip"/>
+    <TextView
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      android:layout_weight="1"/>
+    <Button android:id="@+id/chart_settings_ok"
+      android:layout_width="wrap_content"
+      android:layout_height="48dip"
+      android:layout_gravity="right"
+      android:text="@string/ok"
+      android:textSize="14dip"/>
+  </LinearLayout>
+</LinearLayout>
@@ -0,0 +1,40 @@
+<?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_width="fill_parent"
+  android:layout_height="wrap_content"
+  android:padding="2dip"
+  android:orientation="vertical">
+  <TextView android:id="@+id/maplistitem"
+    android:layout_width="fill_parent"
+    android:layout_height="wrap_content"
+    android:textSize="9pt"
+    android:textStyle="bold"
+    android:textColor="#fff"
+    android:singleLine="true"/>
+    <TextView android:id="@+id/maplistdesc"
+      android:layout_width="fill_parent"
+      android:layout_height="wrap_content"
+      android:textSize="8pt"
+      android:singleLine="true"/>
+    <TextView android:id="@+id/maplistpublic"
+      android:layout_width="fill_parent"
+      android:layout_height="wrap_content"
+      android:textSize="7pt"
+      android:singleLine="true"/>
+</LinearLayout>
@@ -0,0 +1,60 @@
+<?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"
+    android:layout_weight="1">
+  </LinearLayout>
+  <RelativeLayout android:id="@+id/elevation_zoom_layout"
+    android:orientation="vertical"
+    android:layout_width="fill_parent"
+    android:layout_height="fill_parent"
+    android:padding="10dip"
+    android:layout_weight="0">
+    <ZoomControls android:id="@+id/elevation_zoom"
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      android:layout_gravity="center_horizontal"
+      android:layout_alignParentBottom="true"
+      android:layout_centerHorizontal="true"
+      android:layout_alignParentRight="true"/>
+  </RelativeLayout>
+  <LinearLayout android:id="@+id/elevation_busypane"
+    android:orientation="vertical"
+    android:layout_width="fill_parent"
+    android:layout_height="fill_parent"
+    android:layout_weight="0"
+    android:padding="3dip"
+    android:visibility="gone">
+    <ProgressBar
+      android:layout_weight="1"
+      android:layout_height="0dip"
+      android:layout_width="wrap_content"
+      android:maxWidth="80dip"
+      android:maxHeight="80dip"
+      android:minWidth="80dip"
+      android:minHeight="80dip"
+      android:layout_gravity="center"/>
+  </LinearLayout>
+</RelativeLayout>
@@ -0,0 +1,88 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+Copyright 2010 Google Inc.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+  android:orientation="vertical"
+  android:layout_width="fill_parent"
+  android:layout_height="fill_parent"
+  android:paddingTop="10dip"
+  android:background="#c000">
+  <TextView android:text="@string/trackdetails_name"
+    android:layout_width="fill_parent"
+    android:layout_height="wrap_content"/>
+  <LinearLayout
+    android:layout_width="fill_parent"
+    android:layout_height="wrap_content"
+    android:orientation="horizontal">
+    <ImageView android:id="@+id/trackdetails_icon"
+      android:src="@drawable/track"
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      android:layout_gravity="center"
+      android:paddingLeft="4dip"
+      android:paddingRight="4dip"/>
+    <EditText android:id="@+id/trackdetails_name"
+      android:layout_width="fill_parent"
+      android:layout_height="wrap_content"
+      android:singleLine="true"
+      android:autoText="true"
+      android:capitalize="words"
+      android:selectAllOnFocus="true"/>
+  </LinearLayout>
+  <TextView android:text="@string/trackdetails_category"
+    android:layout_width="fill_parent"
+    android:layout_height="wrap_content"/>
+  <AutoCompleteTextView android:id="@+id/trackdetails_category"
+    android:layout_width="fill_parent"
+    android:layout_height="wrap_content"
+    android:singleLine="true"/>
+  <TextView android:text="@string/trackdetails_description"
+    android:layout_width="fill_parent"
+    android:layout_height="wrap_content"/>
+  <EditText android:id="@+id/trackdetails_description"
+    android:layout_width="fill_parent"
+    android:layout_height="0dip"
+    android:singleLine="false"
+    android:autoText="true"
+    android:capitalize="sentences"
+    android:selectAllOnFocus="true"
+    android:maxLines="50"
+    android:gravity="top"
+    android:layout_weight="1"/>
+    <LinearLayout
+      android:orientation="horizontal"
+      android:layout_width="fill_parent"
+      android:layout_height="wrap_content"
+      android:background="@drawable/list_bar"
+      android:padding="3dip">
+      <Button android:id="@+id/trackdetails_cancel"
+        android:layout_width="wrap_content"
+        android:layout_height="48dip"
+        android:layout_gravity="right"
+        android:text="@string/cancel"
+        android:textSize="14dip"/>
+      <TextView
+        android:layout_width="0dip"
+        android:layout_height="wrap_content"
+        android:layout_weight="1"/>
+      <Button android:id="@+id/trackdetails_save"
+        android:layout_width="wrap_content"
+        android:layout_height="48dip"
+        android:layout_gravity="right"
+        android:text="@string/save"
+        android:textSize="14dip"/>
+   </LinearLayout>
+</LinearLayout>
@@ -0,0 +1,83 @@
+<?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:layout_weight="0"
+    android:padding="3dip"
+    android:visibility="gone">
+    <TextView android:id="@+id/messagetext"
+      android:layout_width="fill_parent"
+      android:layout_height="wrap_content"
+      android:textSize="16dip"
+      android:textColor="#fff"
+      android:text="@string/wait_for_fix"
+      android:layout_weight="0"/>
+    </LinearLayout>
+    <LinearLayout android:id="@+id/busypane"
+      android:orientation="vertical"
+      android:layout_width="fill_parent"
+      android:layout_height="fill_parent"
+      android:layout_weight="0"
+      android:padding="3dip"
+      android:visibility="gone">
+      <ProgressBar
+        android:layout_weight="1"
+        android:layout_height="0dip"
+        android:layout_width="wrap_content"
+        android:maxWidth="80dip"
+        android:maxHeight="80dip"
+        android:minWidth="80dip"
+        android:minHeight="80dip"
+        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="10dip">
+      <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>
@@ -0,0 +1,72 @@
+<?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="3dip">
+    <TextView android:id="@+id/message"
+      android:layout_width="fill_parent"
+      android:layout_height="wrap_content"
+      android:textSize="16dip"
+      android:textColor="#fff"
+      android:text="@string/tracklist_pick_one"
+      android:layout_weight="0"/>
+  </LinearLayout>
+  <ListView android:id="@android:id/list"
+    android:layout_width="fill_parent"
+    android:layout_height="wrap_content"
+    android:layout_weight="1"/>
+  <LinearLayout
+    android:orientation="horizontal"
+    android:layout_width="fill_parent"
+    android:layout_height="wrap_content"
+    android:background="@drawable/list_bar"
+    android:layout_weight="0"
+    android:padding="3dip">
+    <Button android:id="@+id/tracklist_btn_export_all"
+      android:layout_width="wrap_content"
+      android:layout_height="48dip"
+      android:layout_gravity="left|top"
+      android:text="@string/tracklist_btn_export_all"
+      android:textSize="14dip"/>
+    <Button android:id="@+id/tracklist_btn_delete_all"
+      android:layout_width="wrap_content"
+      android:layout_height="48dip"
+      android:layout_gravity="left|top"
+      android:text="@string/tracklist_btn_delete_all"
+      android:textSize="14dip"/>
+    <TextView
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      android:layout_weight="1"/>
+    <Button android:id="@+id/tracklist_btn_import_all"
+      android:layout_width="wrap_content"
+      android:layout_height="48dip"
+      android:layout_gravity="left|top"
+      android:text="@string/tracklist_btn_import_all"
+      android:textSize="14dip"/>
+   </LinearLayout>
+</LinearLayout>
@@ -0,0 +1,83 @@
+<?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:paddingTop="2dip"
+  android:paddingBottom="2dip"
+  android:layout_width="fill_parent"
+  android:layout_height="wrap_content"
+  android:minHeight="?android:attr/listPreferredItemHeight"
+  android:orientation="vertical">
+
+  <LinearLayout
+    android:orientation="horizontal"
+    android:layout_width="fill_parent"
+    android:layout_height="wrap_content">
+    <ImageView android:id="@+id/trackdetails_item_icon"
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      android:paddingLeft="4dip"
+      android:paddingRight="2dip"
+      android:paddingTop="5dip"
+      android:src="@drawable/track"/>
+    <LinearLayout
+      android:orientation="horizontal"
+      android:layout_width="fill_parent"
+      android:layout_height="wrap_content">
+      <TextView android:id="@+id/trackdetails_item_name"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginLeft="6dip"
+        android:layout_marginTop="6dip"
+        android:singleLine="true"
+        android:text="Track name"
+        android:textAppearance="?android:attr/textAppearanceLarge"/>
+      <TextView android:id="@+id/trackdetails_item_category"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginLeft="6dip"
+        android:layout_marginTop="6dip"
+        android:singleLine = "true"
+        android:text="Activity type"
+        android:textAppearance="?android:attr/textAppearanceSmall"/>
+    </LinearLayout>
+  </LinearLayout>
+
+  <TextView android:id="@+id/trackdetails_item_time"
+    android:layout_width="fill_parent"
+    android:layout_height="wrap_content"
+    android:layout_marginLeft="6dip"
+    android:singleLine="true"
+    android:textColor="#fff"
+    android:text="Start time"
+    android:textAppearance="?android:attr/textAppearanceSmall"/>
+  <TextView android:id="@+id/trackdetails_item_stats"
+    android:layout_width="fill_parent"
+    android:layout_height="wrap_content"
+    android:layout_marginLeft="6dip"
+    android:singleLine="true"
+    android:textColor="#0f0"
+    android:text="Distance and total time"
+    android:textAppearance="?android:attr/textAppearanceSmall"/>
+  <TextView android:id="@+id/trackdetails_item_description"
+    android:layout_width="fill_parent"
+    android:layout_height="wrap_content"
+    android:layout_marginLeft = "6dip"
+    android:singleLine = "false"
+    android:text="Description"
+    android:textAppearance="?android:attr/textAppearanceSmall"/>
+
+</LinearLayout>
@@ -0,0 +1,70 @@
+<?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:paddingTop="2dip"
+  android:paddingBottom="2dip"
+  android:layout_width="fill_parent"
+  android:layout_height="wrap_content"
+  android:minHeight="?android:attr/listPreferredItemHeight"
+  android:orientation="vertical">
+
+  <LinearLayout
+    android:orientation="horizontal"
+    android:layout_width="fill_parent"
+    android:layout_height="wrap_content">
+
+    <ImageView android:id="@+id/waypointslist_item_icon"
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      android:layout_marginLeft="6dip"
+      android:layout_marginTop="6dip"
+      android:src="@drawable/ylw_pushpin"/>
+
+    <LinearLayout
+      android:orientation="vertical"
+      android:layout_width="fill_parent"
+      android:layout_height="wrap_content">
+
+      <TextView android:id="@+id/waypointslist_item_name"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginLeft="6dip"
+        android:layout_marginTop="6dip"
+        android:singleLine = "true"
+        android:text="Name"
+        android:textAppearance="?android:attr/textAppearanceLarge"/>
+
+      <TextView android:id="@+id/waypointslist_item_time"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginLeft = "6dip"
+        android:singleLine = "true"
+        android:textColor = "#fff"
+        android:text="date and time"
+        android:textAppearance="?android:attr/textAppearanceSmall"/>
+
+      <TextView android:id="@+id/waypointslist_item_category"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginLeft = "6dip"
+        android:singleLine = "true"
+        android:textColor="#0f0"
+        android:text="category"
+        android:textAppearance="?android:attr/textAppearanceSmall" />
+    </LinearLayout>
+  </LinearLayout>
+</LinearLayout>
@@ -0,0 +1,117 @@
+<?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:id="@+id/screen"
+  android:layout_width="fill_parent"
+  android:layout_height="fill_parent"
+  android:orientation="vertical">
+  <LinearLayout
+    android:layout_width="fill_parent"
+    android:layout_height="wrap_content"
+    android:background="@drawable/list_bar">
+    <TextView
+      android:layout_width="fill_parent"
+      android:layout_height="wrap_content"
+      android:text="@string/sendtogoogle_title"
+      android:textSize="20dip"
+      android:textColor="#fff"
+      android:layout_marginLeft="10dip"/>
+  </LinearLayout>
+  <ScrollView android:id="@+id/sendtogoogle_scrollview"
+    android:layout_width="fill_parent"
+    android:layout_height="0dip"
+    android:layout_weight="1">
+    <TableLayout
+      android:layout_width="fill_parent"
+      android:layout_height="wrap_content"
+      android:stretchColumns="1"
+      android:layout_marginTop="5dip"
+      android:layout_marginLeft="5dip">
+      <TableRow>
+        <ImageView android:src="@drawable/googledocs_icon"
+          android:layout_width="wrap_content"
+          android:layout_height="wrap_content"/>
+        <LinearLayout
+          android:layout_width="fill_parent"
+          android:layout_height="wrap_content"
+          android:orientation="vertical"
+          android:layout_marginLeft="10dip">
+          <CheckBox android:id="@+id/sendtogoogle_google_fusiontables"
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:text="@string/sendtogoogle_google_fusiontables"
+            android:textSize="20dip"
+            android:checked="true"/>
+        </LinearLayout>
+      </TableRow>
+      <TableRow>
+        <ImageView android:src="@drawable/googledocs_icon"
+          android:layout_width="wrap_content"
+          android:layout_height="wrap_content"/>
+        <LinearLayout
+          android:layout_width="fill_parent"
+          android:layout_height="wrap_content"
+          android:orientation="vertical"
+          android:layout_marginLeft="10dip">
+          <CheckBox android:id="@+id/sendtogoogle_google_docs"
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:text="@string/sendtogoogle_google_docs"
+            android:textSize="20dip"
+            android:checked="true"/>
+          <RadioGroup android:id="@+id/sendtogoogle_group_docs"
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:visibility="gone">
+            <RadioButton android:id="@+id/sendtogoogle_send_stats"
+              android:layout_width="fill_parent"
+              android:layout_height="wrap_content"
+              android:text="@string/sendtogoogle_send_stats"/>
+            <RadioButton android:id="@+id/sendtogoogle_send_stats_and_points"
+              android:layout_width="fill_parent"
+              android:layout_height="wrap_content"
+              android:text="@string/sendtogoogle_send_stats_and_points"
+              android:enabled="false"/>
+          </RadioGroup>
+        </LinearLayout>
+      </TableRow>
+    </TableLayout>
+  </ScrollView>
+  <LinearLayout
+    android:orientation="horizontal"
+    android:layout_width="fill_parent"
+    android:layout_height="wrap_content"
+    android:background="@drawable/list_bar"
+    android:padding="3dip">
+    <Button android:id="@+id/sendtogoogle_cancel"
+      android:layout_width="wrap_content"
+      android:layout_height="48dip"
+      android:layout_gravity="right"
+      android:text="@string/cancel"
+      android:textSize="14dip"/>
+    <TextView
+      android:layout_width="0dip"
+      android:layout_height="wrap_content"
+      android:layout_weight="1"/>
+    <Button android:id="@+id/sendtogoogle_send_now"
+      android:layout_width="wrap_content"
+      android:layout_height="48dip"
+      android:layout_gravity="right"
+      android:text="@string/sendtogoogle_send_now"
+      android:textSize="14dip"/>
+  </LinearLayout>
+</LinearLayout>
@@ -0,0 +1,509 @@
+<?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="0dip"
+    android:layout_weight="1"
+    android:layout_width="fill_parent"
+    android:scrollbarStyle="insideInset">
+
+    <LinearLayout
+      android:layout_width="fill_parent"
+      android:layout_height="fill_parent"
+      android:orientation="vertical">
+      <TextView android:text="@string/waypointdetails_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:src="@drawable/ylw_pushpin"
+          android:layout_width="wrap_content"
+          android:layout_height="wrap_content"
+          android:layout_gravity="center"
+          android:paddingLeft="4dip"
+          android:paddingRight="2dip"/>
+        <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"/>
+      </LinearLayout>
+      <LinearLayout android:id="@+id/waypointdetails_description_layout"
+        android:orientation="vertical"
+        android:layout_width="fill_parent"
+        android:layout_height="0dip"
+        android:visibility="visible"
+        android:layout_weight="1">
+        <TextView android:id="@+id/waypointdetails_category_label"
+          android:text="@string/waypointdetails_category"
+          android:layout_width="fill_parent"
+          android:layout_height="wrap_content"/>
+        <AutoCompleteTextView android:id="@+id/waypointdetails_category"
+          android:layout_width="fill_parent"
+          android:layout_height="wrap_content"
+          android:singleLine="true"/>
+        <TextView android:text="@string/waypointdetails_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="0dip"
+          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"/>
+      </LinearLayout>
+
+      <TableLayout android:id="@+id/waypoint_stats"
+        android:visibility="gone"
+        android:padding="2dip"
+        android:layout_height="wrap_content"
+        android:layout_width="fill_parent"
+        android:stretchColumns="1,4">
+        <!-- Total distance and max speed -->
+        <TableRow
+          android:padding="1dip">
+          <TextView
+            android:id="@+id/total_distance_label"
+            android:layout_column="1"
+            android:layout_span="3"
+            android:text="@string/total_distance_label" />
+          <TextView
+            android:id="@+id/max_speed_label"
+            android:layout_column="4"
+            android:layout_span="2"
+            android:text="@string/max_speed_label" />
+        </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="-9dip"
+            android:layout_marginTop="-9dip"
+            android:text="@string/unknown"
+            android:textColor="@color/stat_label_text"
+            android:textSize="40sp" />
+          <TextView
+            android:gravity="left"
+            android:id="@+id/total_distance_unit_label"
+            android:layout_column="2"
+            android:layout_marginBottom="-9dip"
+            android:layout_marginTop="-9dip"
+            android:text="@string/mile"
+            android:textColor="@color/stat_label_text" />
+          <!-- TODO 4/08/2009
+          The following is a bad hack to get a spacer the same size as the
+          text.  Ideally this should just be a View, however I don't know how to
+          set the view height properly.  fill_parent on this element causes as
+          NullPointerException. This same filler is repeated on each line.-->
+          <TextView
+            android:background="@color/black"
+            android:layout_column="3"
+            android:layout_marginBottom="-9dip"
+            android:layout_marginTop="-9dip"
+            android:layout_width="5dip"
+            android:textSize="40sp" />
+          <TextView
+            android:gravity="right"
+            android:id="@+id/max_speed_register"
+            android:layout_column="4"
+            android:layout_marginBottom="-9dip"
+            android:layout_marginTop="-9dip"
+            android:text="@string/unknown"
+            android:textColor="@color/stat_label_text"
+            android:textSize="40sp" />
+          <LinearLayout
+            android:gravity="bottom"
+            android:layout_column="5"
+            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="-1dip"
+              android:layout_marginTop="-1dip"
+              android:layout_width="wrap_content"
+              android:textColor="@color/stat_label_text" />
+            <TextView
+              android:background="@color/black"
+              android:layout_height="3dip"
+              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="-1dip"
+              android:layout_marginTop="-1dip"
+              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/total_time_label" />
+          <TextView
+            android:id="@+id/average_speed_label"
+            android:layout_column="4"
+            android:layout_span="2"
+            android:text="@string/average_speed_label" />
+        </TableRow>
+        <TableRow
+          android:background="@color/stat_label_background">
+          <TextView
+            android:gravity="right"
+            android:id="@+id/total_time_register"
+            android:layout_column="1"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="-9dip"
+            android:layout_marginTop="-9dip"
+            android:layout_span="2"
+            android:layout_width="fill_parent"
+            android:text="@string/unknown"
+            android:textColor="@color/stat_label_text"
+            android:textSize="40sp" />
+          <TextView
+            android:background="@color/black"
+            android:layout_column="3"
+            android:layout_marginBottom="-9dip"
+            android:layout_marginTop="-9dip"
+            android:layout_width="5dip"
+            android:textSize="40sp" />
+          <TextView
+            android:gravity="right"
+            android:id="@+id/average_speed_register"
+            android:layout_column="4"
+            android:layout_marginBottom="-9dip"
+            android:layout_marginTop="-9dip"
+            android:text="@string/unknown"
+            android:textColor="@color/stat_label_text"
+            android:textSize="40sp" />
+          <LinearLayout
+            android:gravity="bottom"
+            android:layout_column="5"
+            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="-1dip"
+              android:layout_marginTop="-1dip"
+              android:layout_width="wrap_content"
+              android:textColor="@color/stat_label_text" />
+            <TextView
+              android:background="@color/black"
+              android:layout_height="3dip"
+              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="-1dip"
+              android:layout_marginTop="-1dip"
+              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/moving_time_label" />
+          <TextView
+            android:id="@+id/average_moving_speed_label"
+            android:layout_column="4"
+            android:layout_span="2"
+            android:text="@string/average_moving_speed_label" />
+        </TableRow>
+        <TableRow
+          android:background="@color/stat_label_background">
+          <TextView
+            android:gravity="right"
+            android:id="@+id/moving_time_register"
+            android:layout_column="1"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="-9dip"
+            android:layout_marginTop="-9dip"
+            android:layout_width="fill_parent"
+            android:layout_span="2"
+            android:text="@string/unknown"
+            android:textColor="@color/stat_label_text"
+            android:textSize="40sp" />
+          <TextView
+            android:background="@color/black"
+            android:layout_column="3"
+            android:layout_marginBottom="-9dip"
+            android:layout_marginTop="-9dip"
+            android:layout_width="5dip"
+            android:textSize="40sp" />
+          <TextView
+            android:gravity="right"
+            android:id="@+id/average_moving_speed_register"
+            android:layout_column="4"
+            android:layout_marginBottom="-9dip"
+            android:layout_marginTop="-9dip"
+            android:text="@string/unknown"
+            android:textColor="@color/stat_label_text"
+            android:textSize="40sp" />
+          <LinearLayout
+            android:gravity="bottom"
+            android:layout_column="5"
+            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="-1dip"
+              android:layout_marginTop="-1dip"
+              android:layout_width="wrap_content"
+              android:textColor="@color/stat_label_text" />
+            <TextView
+              android:background="@color/black"
+              android:layout_height="3dip"
+              android:layout_width="fill_parent" />
+            <TextView
+              android:id="@+id/average_moving_speed_unit_label_bottom"
+              android:gravity="bottom"
+              android:layout_height="wrap_content"
+              android:layout_marginBottom="-1dip"
+              android:layout_marginTop="-1dip"
+              android:layout_width="wrap_content"
+              android:textColor="@color/stat_label_text" />
+          </LinearLayout>
+        </TableRow>
+
+        <!-- Elevation and elevation gain -->
+        <TableRow>
+          <TextView
+            android:id="@+id/elevation_label"
+            android:layout_column="1"
+            android:layout_span="3"
+            android:text="@string/elevation_label" />
+          <TextView
+            android:id="@+id/elevation_gain_label"
+            android:layout_column="4"
+            android:layout_span="2"
+            android:text="@string/elevation_gain_label" />
+        </TableRow>
+        <TableRow
+          android:background="@color/stat_label_background">
+          <TextView
+            android:gravity="right"
+            android:id="@+id/elevation_register"
+            android:layout_column="1"
+            android:layout_marginBottom="-9dip"
+            android:layout_marginTop="-9dip"
+            android:text="@string/unknown"
+            android:textColor="@color/stat_label_text"
+            android:textSize="40sp" />
+          <TextView
+            android:gravity="left"
+            android:id="@+id/elevation_unit_label"
+            android:layout_column="2"
+            android:layout_marginBottom="-9dip"
+            android:layout_marginTop="-9dip"
+            android:text="@string/feet"
+            android:textColor="@color/stat_label_text"/>
+          <TextView
+            android:background="@color/black"
+            android:layout_column="3"
+            android:layout_marginBottom="-9dip"
+            android:layout_marginTop="-9dip"
+            android:layout_width="5dip"
+            android:textSize="40sp" />
+          <TextView
+            android:gravity="right"
+            android:id="@+id/elevation_gain_register"
+            android:layout_column="4"
+            android:layout_marginBottom="-9dip"
+            android:layout_marginTop="-9dip"
+            android:text="@string/unknown"
+            android:textColor="@color/stat_label_text"
+            android:textSize="40sp" />
+          <TextView
+            android:gravity="left"
+            android:id="@+id/elevation_gain_unit_label"
+            android:layout_column="5"
+            android:layout_marginBottom="-9dip"
+            android:layout_marginTop="-9dip"
+            android:text="@string/feet"
+            android:textColor="@color/stat_label_text" />
+        </TableRow>
+
+        <!-- Min and max elevation -->
+        <TableRow>
+          <TextView
+            android:id="@+id/min_elevation_label"
+            android:layout_column="1"
+            android:layout_span="3"
+            android:text="@string/min_elevation_label" />
+          <TextView
+            android:id="@+id/max_elevation_label"
+            android:layout_column="4"
+            android:layout_span="3"
+            android:text="@string/max_elevation_label" />
+        </TableRow>
+        <TableRow
+          android:background="@color/stat_label_background">
+          <TextView
+            android:gravity="right"
+            android:id="@+id/min_elevation_register"
+            android:layout_column="1"
+            android:layout_marginBottom="-9dip"
+            android:layout_marginTop="-9dip"
+            android:text="@string/unknown"
+            android:textColor="@color/stat_label_text"
+            android:textSize="40sp" />
+          <TextView
+            android:gravity="left"
+            android:id="@+id/min_elevation_unit_label"
+            android:layout_column="2"
+            android:layout_marginBottom="-9dip"
+            android:layout_marginTop="-9dip"
+            android:text="@string/feet"
+            android:textColor="@color/stat_label_text" />
+          <TextView
+            android:background="@color/black"
+            android:layout_column="3"
+            android:layout_marginBottom="-9dip"
+            android:layout_marginTop="-9dip"
+            android:layout_width="5dip"
+            android:textSize="40sp" />
+          <TextView
+            android:gravity="right"
+            android:id="@+id/max_elevation_register"
+            android:layout_column="4"
+            android:layout_marginBottom="-9dip"
+            android:layout_marginTop="-9dip"
+            android:text="@string/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="-9dip"
+            android:layout_marginTop="-9dip"
+            android:text="@string/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/min_grade_label" />
+          <TextView
+            android:id="@+id/max_grade_label"
+            android:layout_column="4"
+            android:layout_span="2"
+            android:text="@string/max_grade_label" />
+        </TableRow>
+        <TableRow
+          android:background="@color/stat_label_background">
+          <TextView
+            android:gravity="right"
+            android:id="@+id/min_grade_register"
+            android:layout_column="1"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="-9dip"
+            android:layout_marginTop="-9dip"
+            android:layout_width="fill_parent"
+            android:layout_span="2"
+            android:text="@string/unknown"
+            android:textColor="@color/stat_label_text"
+            android:textSize="40sp" />
+          <TextView
+            android:background="@color/black"
+            android:layout_column="3"
+            android:layout_marginBottom="-9dip"
+            android:layout_marginTop="-9dip"
+            android:layout_width="5dip"
+            android:textSize="40sp" />
+          <TextView
+            android:gravity="right"
+            android:id="@+id/max_grade_register"
+            android:layout_column="4"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="-9dip"
+            android:layout_marginTop="-9dip"
+            android:layout_width="fill_parent"
+            android:layout_span="2"
+            android:text="@string/unknown"
+            android:textColor="@color/stat_label_text"
+            android:textSize="40sp" />
+        </TableRow>
+      </TableLayout>
+    </LinearLayout>
+  </ScrollView>
+
+  <LinearLayout
+      android:orientation="horizontal"
+      android:layout_width="fill_parent"
+      android:layout_height="wrap_content"
+      android:background="@drawable/list_bar"
+      android:padding="3dip">
+    <Button android:id="@+id/waypointdetails_cancel"
+      android:layout_width="wrap_content"
+      android:layout_height="48dip"
+      android:layout_gravity="right"
+      android:text="@string/cancel"
+      android:textSize="14dip"/>
+    <TextView
+      android:layout_width="0dip"
+      android:layout_height="wrap_content"
+      android:layout_weight="1"/>
+    <Button android:id="@+id/waypointdetails_save"
+      android:layout_width="wrap_content"
+      android:layout_height="48dip"
+      android:layout_gravity="right"
+      android:text="@string/save"
+      android:textSize="14dip"/>
+  </LinearLayout>
+
+</LinearLayout>
@@ -0,0 +1,67 @@
+<?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="3dip">
+    <TextView android:id="@+id/message"
+      android:layout_width="fill_parent"
+      android:layout_height="wrap_content"
+      android:textSize="16dip"
+      android:textColor="#fff"
+      android:text="@string/waypointslist_pick_one"
+      android:layout_weight="0"/>
+  </LinearLayout>
+
+  <ListView android:id="@android:id/list"
+    android:layout_width="fill_parent"
+    android:layout_height="wrap_content"
+    android:layout_weight="1"/>
+  <LinearLayout
+    android:orientation="horizontal"
+    android:layout_width="fill_parent"
+    android:layout_height="wrap_content"
+    android:background="@drawable/list_bar"
+    android:layout_weight="0"
+    android:padding="3dip">
+    <TextView
+      android:layout_width="0dip"
+      android:layout_height="wrap_content"
+      android:layout_weight="1"/>
+    <Button android:id="@+id/waypointslist_btn_insert_statistics"
+      android:layout_width="wrap_content"
+      android:layout_height="48dip"
+      android:layout_gravity="left|top"
+      android:text="@string/waypointslist_btn_insert_statistics"
+      android:textSize="14dip"/>
+    <Button android:id="@+id/waypointslist_btn_insert_waypoint"
+      android:layout_width="wrap_content"
+      android:layout_height="48dip"
+      android:layout_gravity="left|top"
+      android:text="@string/waypointslist_btn_insert_waypoint"
+      android:textSize="14dip"/>
+   </LinearLayout>
+</LinearLayout>
@@ -0,0 +1,131 @@
+<?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:layout_height="wrap_content"
+  android:orientation="horizontal"
+  android:layout_width="fill_parent">
+
+  <ScrollView
+    android:layout_height="wrap_content"
+    android:layout_width="fill_parent">
+
+    <LinearLayout
+      android:layout_height="wrap_content"
+      android:layout_width="fill_parent">
+
+      <TableLayout
+        android:layout_height="wrap_content"
+        android:stretchColumns="1,4"
+        android:layout_width="fill_parent">
+
+        <!--  Layout the sensor state on one line.  -->
+        <TableRow>
+          <TextView
+            android:layout_span="5"
+            android:text="@string/sensor_state" />
+        </TableRow>
+        <TableRow
+          android:background="@color/stat_label_background">
+          <TextView
+            android:id="@+id/sensor_state_register"
+            android:layout_column="1"
+            android:layout_span="5"
+            style="@style/StatsRegister" />
+        </TableRow>
+
+        <!--  Layout the sensor data age on one line. -->
+        <TableRow>
+          <TextView
+            android:layout_span="5"
+            android:text="@string/sensor_data_time" />
+        </TableRow>
+        <TableRow
+          android:background="@color/stat_label_background">
+          <TextView
+            android:id="@+id/sensor_data_time_register"
+            android:layout_column="1"
+            android:layout_span="5"
+            style="@style/StatsRegister" />
+        </TableRow>
+
+        <!-- Power meter -->
+        <TableRow
+          android:padding="1dip">
+          <TextView
+            android:layout_column="1"
+            android:layout_span="3"
+            android:text="@string/power" />
+        </TableRow>
+        <TableRow
+          android:background="@color/stat_label_background">
+          <TextView
+            style="@style/StatsRegister.Big"
+            android:id="@+id/power_state_register"
+            android:layout_column="1"
+            android:layout_span="4" />
+          <TextView
+            style="@style/StatsUnitSolo" />
+            android:layout_column="5"
+            android:text="@string/watts" />
+        </TableRow>
+        
+        <!-- Cadence -->
+        <TableRow
+          android:padding="1dip">
+          <TextView
+            android:layout_column="1"
+            android:layout_span="3"
+            android:text="@string/cadence" />
+        </TableRow>
+        <TableRow
+          android:background="@color/stat_label_background">
+          <TextView
+            style="@style/StatsRegister.Big"
+            android:id="@+id/cadence_state_register"
+            android:layout_column="4" />
+          <TextView
+            style="@style/StatsUnitSolo" />
+            android:layout_column="2"
+            android:text="@string/revolutions_per_minute" />
+        </TableRow>
+
+        <!-- Heart Rate -->
+        <TableRow
+          android:padding="1dip">
+          <TextView
+            android:layout_column="1"
+            android:layout_span="3"
+            android:text="@string/heart_rate" />
+        </TableRow>
+        <TableRow
+          android:background="@color/stat_label_background">
+          <TextView
+            style="@style/StatsRegister.Big"
+            android:id="@+id/heart_rate_register"
+            android:layout_column="1"
+            android:layout_span="4" />
+          <TextView
+            style="@style/StatsUnitSolo"
+            android:layout_column="5"
+            android:text="@string/bpm" />
+        </TableRow>
+
+      </TableLayout>
+    </LinearLayout>
+  </ScrollView>
+</RelativeLayout>
@@ -0,0 +1,365 @@
+<?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/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="1dip">
+        <TextView
+          android:id="@+id/total_distance_label"
+          android:layout_column="1"
+          android:layout_span="3"
+          android:text="@string/total_distance_label" />
+        <TextView
+          android:id="@+id/max_speed_label"
+          android:layout_column="4"
+          android:layout_span="2"
+          android:text="@string/max_speed_label" />
+      </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/total_time_label" />
+        <TextView
+          android:id="@+id/average_speed_label"
+          android:layout_column="4"
+          android:layout_span="2"
+          android:text="@string/average_speed_label" />
+      </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/moving_time_label" />
+        <TextView
+          android:id="@+id/average_moving_speed_label"
+          android:layout_column="4"
+          android:layout_span="2"
+          android:text="@string/average_moving_speed_label" />
+      </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="3dip"
+            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/elevation_label" />
+        <TextView
+          android:id="@+id/elevation_gain_label"
+          android:layout_column="4"
+          android:layout_span="2"
+          android:text="@string/elevation_gain_label" />
+      </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/min_elevation_label" />
+        <TextView
+          android:id="@+id/max_elevation_label"
+          android:layout_column="4"
+          android:layout_span="3"
+          android:text="@string/max_elevation_label" />
+      </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/min_grade_label" />
+        <TextView
+          android:id="@+id/max_grade_label"
+          android:layout_column="4"
+          android:layout_span="2"
+          android:text="@string/max_grade_label" />
+      </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/latitude_label" />
+        <TextView
+          android:layout_column="4"
+          android:layout_span="2"
+          android:text="@string/longitude_label" />
+      </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:layout_weight="0"
+    android:padding="3dip"
+    android:visibility="gone">
+    <ProgressBar
+      android:layout_weight="1"
+      android:layout_height="0dip"
+      android:layout_width="wrap_content"
+      android:maxWidth="80dip"
+      android:maxHeight="80dip"
+      android:minWidth="80dip"
+      android:minHeight="80dip"
+      android:layout_gravity="center"/>
+  </LinearLayout>
+</RelativeLayout>
@@ -0,0 +1,53 @@
+<?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_width="fill_parent"
+  android:layout_height="fill_parent"
+  android:orientation="vertical">
+  <WebView
+    android:id="@+id/welcome_web"
+    android:layout_width="fill_parent"
+    android:layout_height="fill_parent"
+    android:layout_weight="1" />
+  <LinearLayout
+    android:orientation="horizontal"
+    android:layout_width="fill_parent"
+    android:layout_height="wrap_content"
+    android:layout_weight="0"
+    android:background="@drawable/list_bar"
+    android:padding="3dip">
+    <Button
+      android:id="@+id/welcome_about"
+      android:layout_width="wrap_content"
+      android:layout_height="48dip"
+      android:layout_gravity="left"
+      android:text="@string/welcome_about"
+      android:textSize="14dip" />
+    <TextView
+      android:layout_width="0dip"
+      android:layout_height="wrap_content"
+      android:layout_weight="1" />
+    <Button
+      android:id="@+id/welcome_read_later"
+      android:layout_width="wrap_content"
+      android:layout_height="48dip"
+      android:layout_gravity="right"
+      android:text="@string/welcome_read_later"
+      android:textSize="14dip" />
+  </LinearLayout>
+</LinearLayout>
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android">
+  <item android:id="@+id/menu_start_recording"
+    android:icon="@drawable/ic_menu_recordtrack"
+    android:title="@string/start_recording"/>
+
+  <item android:id="@+id/menu_stop_recording"
+    android:icon="@drawable/ic_menu_stoprecording"
+    android:title="@string/stop_recording"/>
+
+  <item android:id="@+id/menu_list_tracks"
+    android:icon="@drawable/ic_menu_tracklist"
+    android:title="@string/list_tracks"/>
+
+  <item android:id="@+id/menu_list_markers"
+    android:icon="@drawable/ic_menu_waypoints"
+    android:title="@string/list_markers"/>
+
+  <item android:id="@+id/menu_settings"
+    android:icon="@android:drawable/ic_menu_preferences"
+    android:orderInCategory="1001"
+    android:title="@string/settings"/>
+    
+  <item android:id="@+id/menu_aggregated_stats"
+    android:orderInCategory="1002"
+    android:title="@string/aggregated_stats"/>
+
+  <item android:id="@+id/menu_sensor_state"
+    android:icon="@drawable/ic_menu_sensorstatus"
+    android:orderInCategory="1000"
+    android:title="@string/sensor_state"/>
+    
+  <item android:id="@+id/menu_help"
+    android:icon="@android:drawable/ic_menu_info_details"
+    android:orderInCategory="1003"
+    android:title="@string/help"/>
+
+</menu>
--- a/Show More
+++ b/Show More