From 2b6768ed32d7be444c49caa40d30b520177bb22a Mon Sep 17 00:00:00 2001
From: Keith Packard <keithp@keithp.com>
Date: Mon, 22 Jun 2015 20:43:23 -0700
Subject: altosdroid: Switch to four tabs (pad/flight/recover/map)

Ascent and descent were almost the same; no reason to have both.

Signed-off-by: Keith Packard <keithp@keithp.com>
---
 altosdroid/res/layout/tab_ascent.xml  | 299 --------------------------
 altosdroid/res/layout/tab_descent.xml | 339 -----------------------------
 altosdroid/res/layout/tab_flight.xml  | 391 ++++++++++++++++++++++++++++++++++
 altosdroid/res/layout/tab_landed.xml  | 211 ------------------
 altosdroid/res/layout/tab_recover.xml | 211 ++++++++++++++++++
 5 files changed, 602 insertions(+), 849 deletions(-)
 delete mode 100644 altosdroid/res/layout/tab_ascent.xml
 delete mode 100644 altosdroid/res/layout/tab_descent.xml
 create mode 100644 altosdroid/res/layout/tab_flight.xml
 delete mode 100644 altosdroid/res/layout/tab_landed.xml
 create mode 100644 altosdroid/res/layout/tab_recover.xml

(limited to 'altosdroid/res')

diff --git a/altosdroid/res/layout/tab_ascent.xml b/altosdroid/res/layout/tab_ascent.xml
deleted file mode 100644
index b21ec426..00000000
--- a/altosdroid/res/layout/tab_ascent.xml
+++ /dev/null
@@ -1,299 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-     Copyright © 2013 Mike Beattie <mike@ethernal.org>
-
-     This program is free software; you can redistribute it and/or modify
-     it under the terms of the GNU General Public License as published by
-     the Free Software Foundation; version 2 of the License.
-
-     This program is distributed in the hope that it will be useful, but
-     WITHOUT ANY WARRANTY; without even the implied warranty of
-     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-     General Public License for more details.
-
-     You should have received a copy of the GNU General Public License along
-     with this program; if not, write to the Free Software Foundation, Inc.,
-     59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
--->
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-	android:layout_width="fill_parent"
-	android:layout_height="wrap_content"
-	android:orientation="vertical" >
-
-	<LinearLayout
-		xmlns:android="http://schemas.android.com/apk/res/android"
-		android:layout_width="fill_parent"
-		android:layout_height="wrap_content"
-		android:layout_weight="0"
-		android:baselineAligned="true"
-		android:orientation="horizontal"
-		android:paddingTop="5dp" >
-
-		<RelativeLayout
-			android:layout_width="0dp"
-			android:layout_height="wrap_content"
-			android:layout_weight="1" >
-
-			<TextView
-				android:id="@+id/height_label"
-				android:layout_width="wrap_content"
-				android:layout_height="wrap_content"
-				android:text="@string/height_label" />
-
-			<TextView
-				android:id="@+id/height_value"
-				android:layout_width="wrap_content"
-				android:layout_height="wrap_content"
-				android:layout_alignParentRight="true"
-				android:layout_below="@id/height_label"
-				android:text=""
-				android:textAppearance="?android:attr/textAppearanceSmall" />
-		</RelativeLayout>
-
-		<RelativeLayout
-			android:layout_width="0dp"
-			android:layout_height="wrap_content"
-			android:layout_weight="1" >
-
-			<TextView
-				android:id="@+id/max_height_label"
-				android:layout_width="wrap_content"
-				android:layout_height="wrap_content"
-				android:text="@string/max_height_label" />
-
-			<TextView
-				android:id="@+id/max_height_value"
-				android:layout_width="wrap_content"
-				android:layout_height="wrap_content"
-				android:layout_alignParentRight="true"
-				android:layout_below="@id/max_height_label"
-				android:text=""
-				android:textAppearance="?android:attr/textAppearanceSmall" />
-		</RelativeLayout>
-	</LinearLayout>
-
-	<LinearLayout
-		xmlns:android="http://schemas.android.com/apk/res/android"
-		android:layout_width="fill_parent"
-		android:layout_height="wrap_content"
-		android:layout_weight="0"
-		android:baselineAligned="true"
-		android:orientation="horizontal"
-		android:paddingTop="5dp" >
-
-		<RelativeLayout
-			android:layout_width="0dp"
-			android:layout_height="wrap_content"
-			android:layout_weight="1" >
-
-			<TextView
-				android:id="@+id/speed_label"
-				android:layout_width="wrap_content"
-				android:layout_height="wrap_content"
-				android:text="@string/speed_label" />
-
-			<TextView
-				android:id="@+id/speed_value"
-				android:layout_width="wrap_content"
-				android:layout_height="wrap_content"
-				android:layout_alignParentRight="true"
-				android:layout_below="@id/speed_label"
-				android:text=""
-				android:textAppearance="?android:attr/textAppearanceSmall" />
-		</RelativeLayout>
-
-		<RelativeLayout
-			android:layout_width="0dp"
-			android:layout_height="wrap_content"
-			android:layout_weight="1" >
-
-			<TextView
-				android:id="@+id/max_speed_label"
-				android:layout_width="wrap_content"
-				android:layout_height="wrap_content"
-				android:text="@string/max_speed_label" />
-
-			<TextView
-				android:id="@+id/max_speed_value"
-				android:layout_width="wrap_content"
-				android:layout_height="wrap_content"
-				android:layout_alignParentRight="true"
-				android:layout_below="@id/max_speed_label"
-				android:text=""
-				android:textAppearance="?android:attr/textAppearanceSmall" />
-		</RelativeLayout>
-	</LinearLayout>
-
-	<LinearLayout
-		xmlns:android="http://schemas.android.com/apk/res/android"
-		android:layout_width="fill_parent"
-		android:layout_height="wrap_content"
-		android:layout_weight="0"
-		android:baselineAligned="true"
-		android:orientation="horizontal"
-		android:paddingTop="5dp" >
-
-		<RelativeLayout
-			android:layout_width="0dp"
-			android:layout_height="wrap_content"
-			android:layout_weight="1" >
-
-			<TextView
-				android:id="@+id/accel_label"
-				android:layout_width="wrap_content"
-				android:layout_height="wrap_content"
-				android:text="@string/accel_label" />
-
-			<TextView
-				android:id="@+id/accel_value"
-				android:layout_width="wrap_content"
-				android:layout_height="wrap_content"
-				android:layout_alignParentRight="true"
-				android:layout_below="@id/accel_label"
-				android:text=""
-				android:textAppearance="?android:attr/textAppearanceSmall" />
-		</RelativeLayout>
-
-		<RelativeLayout
-			android:layout_width="0dp"
-			android:layout_height="wrap_content"
-			android:layout_weight="1" >
-
-			<TextView
-				android:id="@+id/max_accel_label"
-				android:layout_width="wrap_content"
-				android:layout_height="wrap_content"
-				android:text="@string/max_accel_label" />
-
-			<TextView
-				android:id="@+id/max_accel_value"
-				android:layout_width="wrap_content"
-				android:layout_height="wrap_content"
-				android:layout_alignParentRight="true"
-				android:layout_below="@id/max_accel_label"
-				android:text=""
-				android:textAppearance="?android:attr/textAppearanceSmall" />
-		</RelativeLayout>
-	</LinearLayout>
-
-	<RelativeLayout
-		android:layout_width="wrap_content"
-		android:layout_height="wrap_content"
-		android:paddingTop="5dp" >
-
-		<TextView
-			android:id="@+id/lat_label"
-			android:layout_width="wrap_content"
-			android:layout_height="wrap_content"
-			android:text="@string/latitude_label" />
-
-		<TextView
-			android:id="@+id/lat_value"
-			android:layout_width="wrap_content"
-			android:layout_height="wrap_content"
-			android:layout_alignParentRight="true"
-			android:layout_below="@id/lat_label"
-			android:text=""
-			android:textAppearance="?android:attr/textAppearanceSmall" />
-	</RelativeLayout>
-
-	<RelativeLayout
-		android:layout_width="wrap_content"
-		android:layout_height="wrap_content"
-		android:paddingTop="5dp" >
-
-		<TextView
-			android:id="@+id/lon_label"
-			android:layout_width="wrap_content"
-			android:layout_height="wrap_content"
-			android:text="@string/longitude_label" />
-
-		<TextView
-			android:id="@+id/lon_value"
-			android:layout_width="wrap_content"
-			android:layout_height="wrap_content"
-			android:layout_alignParentRight="true"
-			android:layout_below="@id/lon_label"
-			android:text=""
-			android:textAppearance="?android:attr/textAppearanceSmall" />
-	</RelativeLayout>
-
-	<RelativeLayout
-		android:layout_width="wrap_content"
-		android:layout_height="wrap_content"
-		android:paddingTop="5dp" >
-
-		<ImageView
-			android:id="@+id/apogee_redled"
-			android:layout_width="wrap_content"
-			android:layout_height="wrap_content"
-			android:contentDescription="@string/apogee_voltage_label"
-			android:src="@drawable/grayled" />
-
-		<ImageView
-			android:id="@+id/apogee_greenled"
-			android:layout_width="wrap_content"
-			android:layout_height="wrap_content"
-			android:layout_toRightOf="@id/apogee_redled"
-			android:contentDescription="@string/apogee_voltage_label"
-			android:paddingRight="5dp"
-			android:src="@drawable/grayled" />
-
-		<TextView
-			android:id="@+id/apogee_voltage_label"
-			android:layout_width="wrap_content"
-			android:layout_height="wrap_content"
-			android:layout_toRightOf="@id/apogee_greenled"
-			android:text="@string/apogee_voltage_label" />
-
-		<TextView
-			android:id="@+id/apogee_voltage_value"
-			android:layout_width="wrap_content"
-			android:layout_height="wrap_content"
-			android:layout_alignParentRight="true"
-			android:layout_below="@id/apogee_voltage_label"
-			android:layout_toRightOf="@id/apogee_greenled"
-			android:text=""
-			android:textAppearance="?android:attr/textAppearanceSmall" />
-	</RelativeLayout>
-
-	<RelativeLayout
-		android:layout_width="wrap_content"
-		android:layout_height="wrap_content"
-		android:paddingTop="5dp" >
-
-		<ImageView
-			android:id="@+id/main_redled"
-			android:layout_width="wrap_content"
-			android:layout_height="wrap_content"
-			android:contentDescription="@string/main_voltage_label"
-			android:src="@drawable/grayled" />
-
-		<ImageView
-			android:id="@+id/main_greenled"
-			android:layout_width="wrap_content"
-			android:layout_height="wrap_content"
-			android:layout_toRightOf="@id/main_redled"
-			android:contentDescription="@string/main_voltage_label"
-			android:paddingRight="5dp"
-			android:src="@drawable/grayled" />
-
-		<TextView
-			android:id="@+id/main_voltage_label"
-			android:layout_width="wrap_content"
-			android:layout_height="wrap_content"
-			android:layout_toRightOf="@id/main_greenled"
-			android:text="@string/main_voltage_label" />
-
-		<TextView
-			android:id="@+id/main_voltage_value"
-			android:layout_width="wrap_content"
-			android:layout_height="wrap_content"
-			android:layout_alignParentRight="true"
-			android:layout_below="@id/main_voltage_label"
-			android:layout_toRightOf="@id/main_greenled"
-			android:text=""
-			android:textAppearance="?android:attr/textAppearanceSmall" />
-	</RelativeLayout>
-
-</LinearLayout>
\ No newline at end of file
diff --git a/altosdroid/res/layout/tab_descent.xml b/altosdroid/res/layout/tab_descent.xml
deleted file mode 100644
index 9e1fc820..00000000
--- a/altosdroid/res/layout/tab_descent.xml
+++ /dev/null
@@ -1,339 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-     Copyright © 2013 Mike Beattie <mike@ethernal.org>
-
-     This program is free software; you can redistribute it and/or modify
-     it under the terms of the GNU General Public License as published by
-     the Free Software Foundation; version 2 of the License.
-
-     This program is distributed in the hope that it will be useful, but
-     WITHOUT ANY WARRANTY; without even the implied warranty of
-     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-     General Public License for more details.
-
-     You should have received a copy of the GNU General Public License along
-     with this program; if not, write to the Free Software Foundation, Inc.,
-     59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
--->
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-	android:layout_width="fill_parent"
-	android:layout_height="wrap_content"
-	android:orientation="vertical" >
-
-	<LinearLayout
-		xmlns:android="http://schemas.android.com/apk/res/android"
-		android:layout_width="fill_parent"
-		android:layout_height="wrap_content"
-		android:layout_weight="0"
-		android:baselineAligned="true"
-		android:orientation="horizontal" >
-
-		<RelativeLayout
-			android:layout_width="0dp"
-			android:layout_height="wrap_content"
-			android:layout_weight="1" >
-
-			<TextView
-				android:id="@+id/speed_label"
-				android:layout_width="wrap_content"
-				android:layout_height="wrap_content"
-				android:text="@string/speed_label" />
-
-			<TextView
-				android:id="@+id/speed_value"
-				android:layout_width="wrap_content"
-				android:layout_height="wrap_content"
-				android:layout_alignParentRight="true"
-				android:layout_below="@id/speed_label"
-				android:text=""
-				android:textAppearance="?android:attr/textAppearanceSmall" />
-		</RelativeLayout>
-
-		<RelativeLayout
-			android:layout_width="0dp"
-			android:layout_height="wrap_content"
-			android:layout_weight="1" >
-
-			<TextView
-				android:id="@+id/height_label"
-				android:layout_width="wrap_content"
-				android:layout_height="wrap_content"
-				android:text="@string/height_label" />
-
-			<TextView
-				android:id="@+id/height_value"
-				android:layout_width="wrap_content"
-				android:layout_height="wrap_content"
-				android:layout_alignParentRight="true"
-				android:layout_below="@id/height_label"
-				android:text=""
-				android:textAppearance="?android:attr/textAppearanceSmall" />
-		</RelativeLayout>
-
-	</LinearLayout>
-
-	<LinearLayout
-		xmlns:android="http://schemas.android.com/apk/res/android"
-		android:layout_width="fill_parent"
-		android:layout_height="wrap_content"
-		android:layout_weight="0"
-		android:baselineAligned="true"
-		android:orientation="horizontal"
-		android:paddingTop="5dp" >
-
-		<RelativeLayout
-			android:layout_width="0dp"
-			android:layout_height="wrap_content"
-			android:layout_weight="1" >
-
-			<TextView
-				android:id="@+id/elevation_label"
-				android:layout_width="wrap_content"
-				android:layout_height="wrap_content"
-				android:text="@string/elevation_label" />
-
-			<TextView
-				android:id="@+id/elevation_value"
-				android:layout_width="wrap_content"
-				android:layout_height="wrap_content"
-				android:layout_alignParentRight="true"
-				android:layout_below="@id/elevation_label"
-				android:text=""
-				android:textAppearance="?android:attr/textAppearanceSmall" />
-		</RelativeLayout>
-
-		<RelativeLayout
-			android:layout_width="0dp"
-			android:layout_height="wrap_content"
-			android:layout_weight="1" >
-
-			<TextView
-				android:id="@+id/range_label"
-				android:layout_width="wrap_content"
-				android:layout_height="wrap_content"
-				android:text="@string/range_label" />
-
-			<TextView
-				android:id="@+id/range_value"
-				android:layout_width="wrap_content"
-				android:layout_height="wrap_content"
-				android:layout_alignParentRight="true"
-				android:layout_below="@id/range_label"
-				android:text=""
-				android:textAppearance="?android:attr/textAppearanceSmall" />
-		</RelativeLayout>
-
-	</LinearLayout>
-
-	<LinearLayout
-		xmlns:android="http://schemas.android.com/apk/res/android"
-		android:layout_width="fill_parent"
-		android:layout_height="wrap_content"
-		android:layout_weight="0"
-		android:baselineAligned="true"
-		android:orientation="horizontal"
-		android:paddingTop="5dp" >
-
-		<RelativeLayout
-			android:layout_width="0dp"
-			android:layout_height="wrap_content"
-			android:layout_weight="1" >
-
-			<TextView
-				android:id="@+id/bearing_label"
-				android:layout_width="wrap_content"
-				android:layout_height="wrap_content"
-				android:text="@string/bearing_label" />
-
-			<TextView
-				android:id="@+id/bearing_value"
-				android:layout_width="wrap_content"
-				android:layout_height="wrap_content"
-				android:layout_alignParentRight="true"
-				android:layout_below="@id/bearing_label"
-				android:text=""
-				android:textAppearance="?android:attr/textAppearanceSmall" />
-		</RelativeLayout>
-
-		<RelativeLayout
-			android:layout_width="0dp"
-			android:layout_height="wrap_content"
-			android:layout_weight="1" >
-
-			<TextView
-				android:id="@+id/compass_label"
-				android:layout_width="wrap_content"
-				android:layout_height="wrap_content"
-				android:text="" />
-
-			<TextView
-				android:id="@+id/compass_value"
-				android:layout_width="wrap_content"
-				android:layout_height="wrap_content"
-				android:layout_alignParentRight="true"
-				android:layout_below="@id/compass_label"
-				android:text=""
-				android:textAppearance="?android:attr/textAppearanceSmall" />
-		</RelativeLayout>
-
-	</LinearLayout>
-
-	<LinearLayout
-		xmlns:android="http://schemas.android.com/apk/res/android"
-		android:layout_width="fill_parent"
-		android:layout_height="wrap_content"
-		android:layout_weight="0"
-		android:baselineAligned="true"
-		android:orientation="horizontal"
-		android:paddingTop="5dp" >
-
-		<RelativeLayout
-			android:layout_width="0dp"
-			android:layout_height="wrap_content"
-			android:layout_weight="1" >
-
-			<TextView
-				android:id="@+id/distance_label"
-				android:layout_width="wrap_content"
-				android:layout_height="wrap_content"
-				android:text="@string/gnd_distance_label" />
-
-			<TextView
-				android:id="@+id/distance_value"
-				android:layout_width="wrap_content"
-				android:layout_height="wrap_content"
-				android:layout_alignParentRight="true"
-				android:layout_below="@id/distance_label"
-				android:text=""
-				android:textAppearance="?android:attr/textAppearanceSmall" />
-		</RelativeLayout>
-
-		<TextView
-			android:layout_width="0dp"
-			android:layout_height="wrap_content"
-			android:layout_weight="1" >
-		</TextView>
-
-	</LinearLayout>
-
-	<RelativeLayout
-		android:layout_width="wrap_content"
-		android:layout_height="wrap_content"
-		android:paddingTop="5dp" >
-
-		<TextView
-			android:id="@+id/lat_label"
-			android:layout_width="wrap_content"
-			android:layout_height="wrap_content"
-			android:text="@string/latitude_label" />
-
-		<TextView
-			android:id="@+id/lat_value"
-			android:layout_width="wrap_content"
-			android:layout_height="wrap_content"
-			android:layout_alignParentRight="true"
-			android:layout_below="@id/lat_label"
-			android:text=""
-			android:textAppearance="?android:attr/textAppearanceSmall" />
-	</RelativeLayout>
-
-	<RelativeLayout
-		android:layout_width="wrap_content"
-		android:layout_height="wrap_content"
-		android:paddingTop="5dp" >
-
-		<TextView
-			android:id="@+id/lon_label"
-			android:layout_width="wrap_content"
-			android:layout_height="wrap_content"
-			android:text="@string/longitude_label" />
-
-		<TextView
-			android:id="@+id/lon_value"
-			android:layout_width="wrap_content"
-			android:layout_height="wrap_content"
-			android:layout_alignParentRight="true"
-			android:layout_below="@id/lon_label"
-			android:text=""
-			android:textAppearance="?android:attr/textAppearanceSmall" />
-	</RelativeLayout>
-
-	<RelativeLayout
-		android:layout_width="wrap_content"
-		android:layout_height="wrap_content"
-		android:paddingTop="5dp" >
-
-		<ImageView
-			android:id="@+id/apogee_redled"
-			android:layout_width="wrap_content"
-			android:layout_height="wrap_content"
-			android:contentDescription="@string/apogee_voltage_label"
-			android:src="@drawable/grayled" />
-
-		<ImageView
-			android:id="@+id/apogee_greenled"
-			android:layout_width="wrap_content"
-			android:layout_height="wrap_content"
-			android:layout_toRightOf="@id/apogee_redled"
-			android:contentDescription="@string/apogee_voltage_label"
-			android:paddingRight="5dp"
-			android:src="@drawable/grayled" />
-
-		<TextView
-			android:id="@+id/apogee_voltage_label"
-			android:layout_width="wrap_content"
-			android:layout_height="wrap_content"
-			android:layout_toRightOf="@id/apogee_greenled"
-			android:text="@string/apogee_voltage_label" />
-
-		<TextView
-			android:id="@+id/apogee_voltage_value"
-			android:layout_width="wrap_content"
-			android:layout_height="wrap_content"
-			android:layout_alignParentRight="true"
-			android:layout_below="@id/apogee_voltage_label"
-			android:layout_toRightOf="@id/apogee_greenled"
-			android:text=""
-			android:textAppearance="?android:attr/textAppearanceSmall" />
-	</RelativeLayout>
-
-	<RelativeLayout
-		android:layout_width="wrap_content"
-		android:layout_height="wrap_content"
-		android:paddingTop="5dp" >
-
-		<ImageView
-			android:id="@+id/main_redled"
-			android:layout_width="wrap_content"
-			android:layout_height="wrap_content"
-			android:contentDescription="@string/main_voltage_label"
-			android:src="@drawable/grayled" />
-
-		<ImageView
-			android:id="@+id/main_greenled"
-			android:layout_width="wrap_content"
-			android:layout_height="wrap_content"
-			android:layout_toRightOf="@id/main_redled"
-			android:contentDescription="@string/main_voltage_label"
-			android:paddingRight="5dp"
-			android:src="@drawable/grayled" />
-
-		<TextView
-			android:id="@+id/main_voltage_label"
-			android:layout_width="wrap_content"
-			android:layout_height="wrap_content"
-			android:layout_toRightOf="@id/main_greenled"
-			android:text="@string/main_voltage_label" />
-
-		<TextView
-			android:id="@+id/main_voltage_value"
-			android:layout_width="wrap_content"
-			android:layout_height="wrap_content"
-			android:layout_alignParentRight="true"
-			android:layout_below="@id/main_voltage_label"
-			android:layout_toRightOf="@id/main_greenled"
-			android:text=""
-			android:textAppearance="?android:attr/textAppearanceSmall" />
-	</RelativeLayout>
-
-</LinearLayout>
diff --git a/altosdroid/res/layout/tab_flight.xml b/altosdroid/res/layout/tab_flight.xml
new file mode 100644
index 00000000..4fa026ca
--- /dev/null
+++ b/altosdroid/res/layout/tab_flight.xml
@@ -0,0 +1,391 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright © 2013 Mike Beattie <mike@ethernal.org>
+
+     This program is free software; you can redistribute it and/or modify
+     it under the terms of the GNU General Public License as published by
+     the Free Software Foundation; version 2 of the License.
+
+     This program is distributed in the hope that it will be useful, but
+     WITHOUT ANY WARRANTY; without even the implied warranty of
+     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+     General Public License for more details.
+
+     You should have received a copy of the GNU General Public License along
+     with this program; if not, write to the Free Software Foundation, Inc.,
+     59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+-->
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+	android:layout_width="fill_parent"
+	android:layout_height="wrap_content"
+	android:orientation="vertical" >
+
+	<LinearLayout
+		xmlns:android="http://schemas.android.com/apk/res/android"
+		android:layout_width="fill_parent"
+		android:layout_height="wrap_content"
+		android:layout_weight="0"
+		android:baselineAligned="true"
+		android:orientation="horizontal" >
+
+		<RelativeLayout
+			android:layout_width="0dp"
+			android:layout_height="wrap_content"
+			android:layout_weight="1" >
+
+			<TextView
+				android:id="@+id/speed_label"
+				android:layout_width="wrap_content"
+				android:layout_height="wrap_content"
+				android:text="@string/speed_label" />
+
+			<TextView
+				android:id="@+id/speed_value"
+				android:layout_width="wrap_content"
+				android:layout_height="wrap_content"
+				android:layout_alignParentRight="true"
+				android:layout_below="@id/speed_label"
+				android:text=""
+				android:textAppearance="?android:attr/textAppearanceSmall" />
+		</RelativeLayout>
+
+		<RelativeLayout
+			android:layout_width="0dp"
+			android:layout_height="wrap_content"
+			android:layout_weight="1" >
+
+			<TextView
+				android:id="@+id/height_label"
+				android:layout_width="wrap_content"
+				android:layout_height="wrap_content"
+				android:text="@string/height_label" />
+
+			<TextView
+				android:id="@+id/height_value"
+				android:layout_width="wrap_content"
+				android:layout_height="wrap_content"
+				android:layout_alignParentRight="true"
+				android:layout_below="@id/height_label"
+				android:text=""
+				android:textAppearance="?android:attr/textAppearanceSmall" />
+		</RelativeLayout>
+
+	</LinearLayout>
+
+	<LinearLayout
+		xmlns:android="http://schemas.android.com/apk/res/android"
+		android:layout_width="fill_parent"
+		android:layout_height="wrap_content"
+		android:layout_weight="0"
+		android:baselineAligned="true"
+		android:orientation="horizontal" >
+
+		<RelativeLayout
+			android:layout_width="0dp"
+			android:layout_height="wrap_content"
+			android:layout_weight="1" >
+
+			<TextView
+				android:id="@+id/max_speed_label"
+				android:layout_width="wrap_content"
+				android:layout_height="wrap_content"
+				android:text="@string/max_speed_label" />
+
+			<TextView
+				android:id="@+id/max_speed_value"
+				android:layout_width="wrap_content"
+				android:layout_height="wrap_content"
+				android:layout_alignParentRight="true"
+				android:layout_below="@id/max_speed_label"
+				android:text=""
+				android:textAppearance="?android:attr/textAppearanceSmall" />
+		</RelativeLayout>
+
+		<RelativeLayout
+			android:layout_width="0dp"
+			android:layout_height="wrap_content"
+			android:layout_weight="1" >
+
+			<TextView
+				android:id="@+id/max_height_label"
+				android:layout_width="wrap_content"
+				android:layout_height="wrap_content"
+				android:text="@string/max_height_label" />
+
+			<TextView
+				android:id="@+id/max_height_value"
+				android:layout_width="wrap_content"
+				android:layout_height="wrap_content"
+				android:layout_alignParentRight="true"
+				android:layout_below="@id/max_height_label"
+				android:text=""
+				android:textAppearance="?android:attr/textAppearanceSmall" />
+		</RelativeLayout>
+
+	</LinearLayout>
+
+	<LinearLayout
+		xmlns:android="http://schemas.android.com/apk/res/android"
+		android:layout_width="fill_parent"
+		android:layout_height="wrap_content"
+		android:layout_weight="0"
+		android:baselineAligned="true"
+		android:orientation="horizontal"
+		android:paddingTop="5dp" >
+
+		<RelativeLayout
+			android:layout_width="0dp"
+			android:layout_height="wrap_content"
+			android:layout_weight="1" >
+
+			<TextView
+				android:id="@+id/elevation_label"
+				android:layout_width="wrap_content"
+				android:layout_height="wrap_content"
+				android:text="@string/elevation_label" />
+
+			<TextView
+				android:id="@+id/elevation_value"
+				android:layout_width="wrap_content"
+				android:layout_height="wrap_content"
+				android:layout_alignParentRight="true"
+				android:layout_below="@id/elevation_label"
+				android:text=""
+				android:textAppearance="?android:attr/textAppearanceSmall" />
+		</RelativeLayout>
+
+		<RelativeLayout
+			android:layout_width="0dp"
+			android:layout_height="wrap_content"
+			android:layout_weight="1" >
+
+			<TextView
+				android:id="@+id/range_label"
+				android:layout_width="wrap_content"
+				android:layout_height="wrap_content"
+				android:text="@string/range_label" />
+
+			<TextView
+				android:id="@+id/range_value"
+				android:layout_width="wrap_content"
+				android:layout_height="wrap_content"
+				android:layout_alignParentRight="true"
+				android:layout_below="@id/range_label"
+				android:text=""
+				android:textAppearance="?android:attr/textAppearanceSmall" />
+		</RelativeLayout>
+
+	</LinearLayout>
+
+	<LinearLayout
+		xmlns:android="http://schemas.android.com/apk/res/android"
+		android:layout_width="fill_parent"
+		android:layout_height="wrap_content"
+		android:layout_weight="0"
+		android:baselineAligned="true"
+		android:orientation="horizontal"
+		android:paddingTop="5dp" >
+
+		<RelativeLayout
+			android:layout_width="0dp"
+			android:layout_height="wrap_content"
+			android:layout_weight="1" >
+
+			<TextView
+				android:id="@+id/bearing_label"
+				android:layout_width="wrap_content"
+				android:layout_height="wrap_content"
+				android:text="@string/bearing_label" />
+
+			<TextView
+				android:id="@+id/bearing_value"
+				android:layout_width="wrap_content"
+				android:layout_height="wrap_content"
+				android:layout_alignParentRight="true"
+				android:layout_below="@id/bearing_label"
+				android:text=""
+				android:textAppearance="?android:attr/textAppearanceSmall" />
+		</RelativeLayout>
+
+		<RelativeLayout
+			android:layout_width="0dp"
+			android:layout_height="wrap_content"
+			android:layout_weight="1" >
+
+			<TextView
+				android:id="@+id/compass_label"
+				android:layout_width="wrap_content"
+				android:layout_height="wrap_content"
+				android:text="" />
+
+			<TextView
+				android:id="@+id/compass_value"
+				android:layout_width="wrap_content"
+				android:layout_height="wrap_content"
+				android:layout_alignParentRight="true"
+				android:layout_below="@id/compass_label"
+				android:text=""
+				android:textAppearance="?android:attr/textAppearanceSmall" />
+		</RelativeLayout>
+
+	</LinearLayout>
+
+	<LinearLayout
+		xmlns:android="http://schemas.android.com/apk/res/android"
+		android:layout_width="fill_parent"
+		android:layout_height="wrap_content"
+		android:layout_weight="0"
+		android:baselineAligned="true"
+		android:orientation="horizontal"
+		android:paddingTop="5dp" >
+
+		<RelativeLayout
+			android:layout_width="0dp"
+			android:layout_height="wrap_content"
+			android:layout_weight="1" >
+
+			<TextView
+				android:id="@+id/distance_label"
+				android:layout_width="wrap_content"
+				android:layout_height="wrap_content"
+				android:text="@string/gnd_distance_label" />
+
+			<TextView
+				android:id="@+id/distance_value"
+				android:layout_width="wrap_content"
+				android:layout_height="wrap_content"
+				android:layout_alignParentRight="true"
+				android:layout_below="@id/distance_label"
+				android:text=""
+				android:textAppearance="?android:attr/textAppearanceSmall" />
+		</RelativeLayout>
+
+		<TextView
+			android:layout_width="0dp"
+			android:layout_height="wrap_content"
+			android:layout_weight="1" >
+		</TextView>
+
+	</LinearLayout>
+
+	<RelativeLayout
+		android:layout_width="wrap_content"
+		android:layout_height="wrap_content"
+		android:paddingTop="5dp" >
+
+		<TextView
+			android:id="@+id/lat_label"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:text="@string/latitude_label" />
+
+		<TextView
+			android:id="@+id/lat_value"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:layout_alignParentRight="true"
+			android:layout_below="@id/lat_label"
+			android:text=""
+			android:textAppearance="?android:attr/textAppearanceSmall" />
+	</RelativeLayout>
+
+	<RelativeLayout
+		android:layout_width="wrap_content"
+		android:layout_height="wrap_content"
+		android:paddingTop="5dp" >
+
+		<TextView
+			android:id="@+id/lon_label"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:text="@string/longitude_label" />
+
+		<TextView
+			android:id="@+id/lon_value"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:layout_alignParentRight="true"
+			android:layout_below="@id/lon_label"
+			android:text=""
+			android:textAppearance="?android:attr/textAppearanceSmall" />
+	</RelativeLayout>
+
+	<RelativeLayout
+		android:layout_width="wrap_content"
+		android:layout_height="wrap_content"
+		android:paddingTop="5dp" >
+
+		<ImageView
+			android:id="@+id/apogee_redled"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:contentDescription="@string/apogee_voltage_label"
+			android:src="@drawable/grayled" />
+
+		<ImageView
+			android:id="@+id/apogee_greenled"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:layout_toRightOf="@id/apogee_redled"
+			android:contentDescription="@string/apogee_voltage_label"
+			android:paddingRight="5dp"
+			android:src="@drawable/grayled" />
+
+		<TextView
+			android:id="@+id/apogee_voltage_label"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:layout_toRightOf="@id/apogee_greenled"
+			android:text="@string/apogee_voltage_label" />
+
+		<TextView
+			android:id="@+id/apogee_voltage_value"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:layout_alignParentRight="true"
+			android:layout_below="@id/apogee_voltage_label"
+			android:layout_toRightOf="@id/apogee_greenled"
+			android:text=""
+			android:textAppearance="?android:attr/textAppearanceSmall" />
+	</RelativeLayout>
+
+	<RelativeLayout
+		android:layout_width="wrap_content"
+		android:layout_height="wrap_content"
+		android:paddingTop="5dp" >
+
+		<ImageView
+			android:id="@+id/main_redled"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:contentDescription="@string/main_voltage_label"
+			android:src="@drawable/grayled" />
+
+		<ImageView
+			android:id="@+id/main_greenled"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:layout_toRightOf="@id/main_redled"
+			android:contentDescription="@string/main_voltage_label"
+			android:paddingRight="5dp"
+			android:src="@drawable/grayled" />
+
+		<TextView
+			android:id="@+id/main_voltage_label"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:layout_toRightOf="@id/main_greenled"
+			android:text="@string/main_voltage_label" />
+
+		<TextView
+			android:id="@+id/main_voltage_value"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:layout_alignParentRight="true"
+			android:layout_below="@id/main_voltage_label"
+			android:layout_toRightOf="@id/main_greenled"
+			android:text=""
+			android:textAppearance="?android:attr/textAppearanceSmall" />
+	</RelativeLayout>
+
+</LinearLayout>
diff --git a/altosdroid/res/layout/tab_landed.xml b/altosdroid/res/layout/tab_landed.xml
deleted file mode 100644
index f27baa9e..00000000
--- a/altosdroid/res/layout/tab_landed.xml
+++ /dev/null
@@ -1,211 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-     Copyright © 2013 Mike Beattie <mike@ethernal.org>
-
-     This program is free software; you can redistribute it and/or modify
-     it under the terms of the GNU General Public License as published by
-     the Free Software Foundation; version 2 of the License.
-
-     This program is distributed in the hope that it will be useful, but
-     WITHOUT ANY WARRANTY; without even the implied warranty of
-     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-     General Public License for more details.
-
-     You should have received a copy of the GNU General Public License along
-     with this program; if not, write to the Free Software Foundation, Inc.,
-     59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
--->
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-	android:layout_width="fill_parent"
-	android:layout_height="wrap_content"
-	android:orientation="vertical" >
-
-	<RelativeLayout
-		android:layout_width="wrap_content"
-		android:layout_height="wrap_content" >
-
-		<TextView
-			android:id="@+id/bearing_label"
-			android:layout_width="wrap_content"
-			android:layout_height="wrap_content"
-			android:text="@string/bearing_label" />
-
-		<TextView
-			android:id="@+id/bearing_value"
-			android:layout_width="wrap_content"
-			android:layout_height="wrap_content"
-			android:layout_alignParentRight="true"
-			android:layout_below="@+id/bearing_label"
-			android:text=""
-			android:textAppearance="?android:attr/textAppearanceSmall" />
-	</RelativeLayout>
-
-	<RelativeLayout
-		android:layout_width="wrap_content"
-		android:layout_height="wrap_content"
-		android:paddingTop="5dp" >
-
-		<TextView
-			android:id="@+id/distance_label"
-			android:layout_width="wrap_content"
-			android:layout_height="wrap_content"
-			android:text="@string/distance_label" />
-
-		<TextView
-			android:id="@+id/distance_value"
-			android:layout_width="wrap_content"
-			android:layout_height="wrap_content"
-			android:layout_alignParentRight="true"
-			android:layout_below="@+id/distance_label"
-			android:text=""
-			android:textAppearance="?android:attr/textAppearanceSmall" />
-	</RelativeLayout>
-
-	<RelativeLayout
-		android:layout_width="wrap_content"
-		android:layout_height="wrap_content"
-		android:paddingTop="5dp" >
-
-		<TextView
-			android:id="@+id/target_lat_label"
-			android:layout_width="wrap_content"
-			android:layout_height="wrap_content"
-			android:text="@string/target_latitude_label" />
-
-		<TextView
-			android:id="@+id/target_lat_value"
-			android:layout_width="wrap_content"
-			android:layout_height="wrap_content"
-			android:layout_alignParentRight="true"
-			android:layout_below="@id/target_lat_label"
-			android:text=""
-			android:textAppearance="?android:attr/textAppearanceSmall" />
-	</RelativeLayout>
-
-	<RelativeLayout
-		android:layout_width="wrap_content"
-		android:layout_height="wrap_content"
-		android:paddingTop="5dp" >
-
-		<TextView
-			android:id="@+id/target_lon_label"
-			android:layout_width="wrap_content"
-			android:layout_height="wrap_content"
-			android:text="@string/target_longitude_label" />
-
-		<TextView
-			android:id="@+id/target_lon_value"
-			android:layout_width="wrap_content"
-			android:layout_height="wrap_content"
-			android:layout_alignParentRight="true"
-			android:layout_below="@id/target_lon_label"
-			android:text=""
-			android:textAppearance="?android:attr/textAppearanceSmall" />
-	</RelativeLayout>
-
-	<RelativeLayout
-		android:layout_width="wrap_content"
-		android:layout_height="wrap_content"
-		android:paddingTop="5dp" >
-
-		<TextView
-			android:id="@+id/receiver_lat_label"
-			android:layout_width="wrap_content"
-			android:layout_height="wrap_content"
-			android:text="@string/receiver_latitude_label" />
-
-		<TextView
-			android:id="@+id/receiver_lat_value"
-			android:layout_width="wrap_content"
-			android:layout_height="wrap_content"
-			android:layout_alignParentRight="true"
-			android:layout_below="@id/receiver_lat_label"
-			android:text=""
-			android:textAppearance="?android:attr/textAppearanceSmall" />
-	</RelativeLayout>
-
-	<RelativeLayout
-		android:layout_width="wrap_content"
-		android:layout_height="wrap_content"
-		android:paddingTop="5dp" >
-
-		<TextView
-			android:id="@+id/receiver_lon_label"
-			android:layout_width="wrap_content"
-			android:layout_height="wrap_content"
-			android:text="@string/receiver_longitude_label" />
-
-		<TextView
-			android:id="@+id/receiver_lon_value"
-			android:layout_width="wrap_content"
-			android:layout_height="wrap_content"
-			android:layout_alignParentRight="true"
-			android:layout_below="@id/receiver_lon_label"
-			android:text=""
-			android:textAppearance="?android:attr/textAppearanceSmall" />
-	</RelativeLayout>
-
-	<RelativeLayout
-		android:layout_width="wrap_content"
-		android:layout_height="wrap_content"
-		android:paddingTop="5dp" >
-
-		<TextView
-			android:id="@+id/max_height_label"
-			android:layout_width="wrap_content"
-			android:layout_height="wrap_content"
-			android:text="@string/max_height_label" />
-
-		<TextView
-			android:id="@+id/max_height_value"
-			android:layout_width="wrap_content"
-			android:layout_height="wrap_content"
-			android:layout_alignParentRight="true"
-			android:layout_below="@id/max_height_label"
-			android:text=""
-			android:textAppearance="?android:attr/textAppearanceSmall" />
-	</RelativeLayout>
-
-	<RelativeLayout
-		android:layout_width="wrap_content"
-		android:layout_height="wrap_content"
-		android:paddingTop="5dp" >
-
-		<TextView
-			android:id="@+id/max_speed_label"
-			android:layout_width="wrap_content"
-			android:layout_height="wrap_content"
-			android:text="@string/max_speed_label" />
-
-		<TextView
-			android:id="@+id/max_speed_value"
-			android:layout_width="wrap_content"
-			android:layout_height="wrap_content"
-			android:layout_alignParentRight="true"
-			android:layout_below="@id/max_speed_label"
-			android:text=""
-			android:textAppearance="?android:attr/textAppearanceSmall" />
-	</RelativeLayout>
-
-	<RelativeLayout
-		android:layout_width="wrap_content"
-		android:layout_height="wrap_content"
-		android:paddingTop="5dp" >
-
-		<TextView
-			android:id="@+id/max_accel_label"
-			android:layout_width="wrap_content"
-			android:layout_height="wrap_content"
-			android:text="@string/max_accel_label" />
-
-		<TextView
-			android:id="@+id/max_accel_value"
-			android:layout_width="wrap_content"
-			android:layout_height="wrap_content"
-			android:layout_alignParentRight="true"
-			android:layout_below="@id/max_accel_label"
-			android:text=""
-			android:textAppearance="?android:attr/textAppearanceSmall" />
-	</RelativeLayout>
-
-</LinearLayout>
\ No newline at end of file
diff --git a/altosdroid/res/layout/tab_recover.xml b/altosdroid/res/layout/tab_recover.xml
new file mode 100644
index 00000000..f27baa9e
--- /dev/null
+++ b/altosdroid/res/layout/tab_recover.xml
@@ -0,0 +1,211 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright © 2013 Mike Beattie <mike@ethernal.org>
+
+     This program is free software; you can redistribute it and/or modify
+     it under the terms of the GNU General Public License as published by
+     the Free Software Foundation; version 2 of the License.
+
+     This program is distributed in the hope that it will be useful, but
+     WITHOUT ANY WARRANTY; without even the implied warranty of
+     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+     General Public License for more details.
+
+     You should have received a copy of the GNU General Public License along
+     with this program; if not, write to the Free Software Foundation, Inc.,
+     59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+-->
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+	android:layout_width="fill_parent"
+	android:layout_height="wrap_content"
+	android:orientation="vertical" >
+
+	<RelativeLayout
+		android:layout_width="wrap_content"
+		android:layout_height="wrap_content" >
+
+		<TextView
+			android:id="@+id/bearing_label"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:text="@string/bearing_label" />
+
+		<TextView
+			android:id="@+id/bearing_value"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:layout_alignParentRight="true"
+			android:layout_below="@+id/bearing_label"
+			android:text=""
+			android:textAppearance="?android:attr/textAppearanceSmall" />
+	</RelativeLayout>
+
+	<RelativeLayout
+		android:layout_width="wrap_content"
+		android:layout_height="wrap_content"
+		android:paddingTop="5dp" >
+
+		<TextView
+			android:id="@+id/distance_label"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:text="@string/distance_label" />
+
+		<TextView
+			android:id="@+id/distance_value"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:layout_alignParentRight="true"
+			android:layout_below="@+id/distance_label"
+			android:text=""
+			android:textAppearance="?android:attr/textAppearanceSmall" />
+	</RelativeLayout>
+
+	<RelativeLayout
+		android:layout_width="wrap_content"
+		android:layout_height="wrap_content"
+		android:paddingTop="5dp" >
+
+		<TextView
+			android:id="@+id/target_lat_label"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:text="@string/target_latitude_label" />
+
+		<TextView
+			android:id="@+id/target_lat_value"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:layout_alignParentRight="true"
+			android:layout_below="@id/target_lat_label"
+			android:text=""
+			android:textAppearance="?android:attr/textAppearanceSmall" />
+	</RelativeLayout>
+
+	<RelativeLayout
+		android:layout_width="wrap_content"
+		android:layout_height="wrap_content"
+		android:paddingTop="5dp" >
+
+		<TextView
+			android:id="@+id/target_lon_label"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:text="@string/target_longitude_label" />
+
+		<TextView
+			android:id="@+id/target_lon_value"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:layout_alignParentRight="true"
+			android:layout_below="@id/target_lon_label"
+			android:text=""
+			android:textAppearance="?android:attr/textAppearanceSmall" />
+	</RelativeLayout>
+
+	<RelativeLayout
+		android:layout_width="wrap_content"
+		android:layout_height="wrap_content"
+		android:paddingTop="5dp" >
+
+		<TextView
+			android:id="@+id/receiver_lat_label"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:text="@string/receiver_latitude_label" />
+
+		<TextView
+			android:id="@+id/receiver_lat_value"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:layout_alignParentRight="true"
+			android:layout_below="@id/receiver_lat_label"
+			android:text=""
+			android:textAppearance="?android:attr/textAppearanceSmall" />
+	</RelativeLayout>
+
+	<RelativeLayout
+		android:layout_width="wrap_content"
+		android:layout_height="wrap_content"
+		android:paddingTop="5dp" >
+
+		<TextView
+			android:id="@+id/receiver_lon_label"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:text="@string/receiver_longitude_label" />
+
+		<TextView
+			android:id="@+id/receiver_lon_value"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:layout_alignParentRight="true"
+			android:layout_below="@id/receiver_lon_label"
+			android:text=""
+			android:textAppearance="?android:attr/textAppearanceSmall" />
+	</RelativeLayout>
+
+	<RelativeLayout
+		android:layout_width="wrap_content"
+		android:layout_height="wrap_content"
+		android:paddingTop="5dp" >
+
+		<TextView
+			android:id="@+id/max_height_label"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:text="@string/max_height_label" />
+
+		<TextView
+			android:id="@+id/max_height_value"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:layout_alignParentRight="true"
+			android:layout_below="@id/max_height_label"
+			android:text=""
+			android:textAppearance="?android:attr/textAppearanceSmall" />
+	</RelativeLayout>
+
+	<RelativeLayout
+		android:layout_width="wrap_content"
+		android:layout_height="wrap_content"
+		android:paddingTop="5dp" >
+
+		<TextView
+			android:id="@+id/max_speed_label"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:text="@string/max_speed_label" />
+
+		<TextView
+			android:id="@+id/max_speed_value"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:layout_alignParentRight="true"
+			android:layout_below="@id/max_speed_label"
+			android:text=""
+			android:textAppearance="?android:attr/textAppearanceSmall" />
+	</RelativeLayout>
+
+	<RelativeLayout
+		android:layout_width="wrap_content"
+		android:layout_height="wrap_content"
+		android:paddingTop="5dp" >
+
+		<TextView
+			android:id="@+id/max_accel_label"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:text="@string/max_accel_label" />
+
+		<TextView
+			android:id="@+id/max_accel_value"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:layout_alignParentRight="true"
+			android:layout_below="@id/max_accel_label"
+			android:text=""
+			android:textAppearance="?android:attr/textAppearanceSmall" />
+	</RelativeLayout>
+
+</LinearLayout>
\ No newline at end of file
-- 
cgit v1.2.3