From 59dfcbe14622c20aaa7d5b131eece9f4c8db6887 Mon Sep 17 00:00:00 2001
From: Mike Beattie <mike@ethernal.org>
Date: Thu, 7 Mar 2013 21:28:45 +1300
Subject: altosdroid: Import initial versions of XML and Java for Tab content

* Includes TabsAdapter class borrowed from Support Library sample code
* New "GoNoGoLights" class for dealing with the red/green/gray LEDs
* extra required strings in strings.xml
* Couple of support functions in AltosDroid.java
* rudimentary Maps tab - does nothing at present.

Signed-off-by: Mike Beattie <mike@ethernal.org>
---
 altosdroid/res/layout/tab_ascent.xml  | 299 ++++++++++++++++++++++++++++++
 altosdroid/res/layout/tab_descent.xml | 339 ++++++++++++++++++++++++++++++++++
 altosdroid/res/layout/tab_landed.xml  | 169 +++++++++++++++++
 altosdroid/res/layout/tab_map.xml     |  22 +++
 altosdroid/res/layout/tab_pad.xml     | 320 ++++++++++++++++++++++++++++++++
 altosdroid/res/values/strings.xml     |  18 ++
 6 files changed, 1167 insertions(+)
 create mode 100644 altosdroid/res/layout/tab_ascent.xml
 create mode 100644 altosdroid/res/layout/tab_descent.xml
 create mode 100644 altosdroid/res/layout/tab_landed.xml
 create mode 100644 altosdroid/res/layout/tab_map.xml
 create mode 100644 altosdroid/res/layout/tab_pad.xml

(limited to 'altosdroid/res')

diff --git a/altosdroid/res/layout/tab_ascent.xml b/altosdroid/res/layout/tab_ascent.xml
new file mode 100644
index 00000000..b7e97086
--- /dev/null
+++ b/altosdroid/res/layout/tab_ascent.xml
@@ -0,0 +1,299 @@
+<?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/textAppearanceLarge" />
+		</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/textAppearanceLarge" />
+		</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/textAppearanceLarge" />
+		</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/textAppearanceLarge" />
+		</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/textAppearanceLarge" />
+		</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/textAppearanceLarge" />
+		</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/textAppearanceLarge" />
+	</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/textAppearanceLarge" />
+	</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/redled" />
+
+		<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/textAppearanceLarge" />
+	</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/redled" />
+
+		<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/textAppearanceLarge" />
+	</RelativeLayout>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/altosdroid/res/layout/tab_descent.xml b/altosdroid/res/layout/tab_descent.xml
new file mode 100644
index 00000000..4b62acf9
--- /dev/null
+++ b/altosdroid/res/layout/tab_descent.xml
@@ -0,0 +1,339 @@
+<?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/textAppearanceLarge" />
+		</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/textAppearanceLarge" />
+		</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/textAppearanceLarge" />
+		</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/textAppearanceLarge" />
+		</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/textAppearanceLarge" />
+		</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/textAppearanceLarge" />
+		</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/textAppearanceLarge" />
+		</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/textAppearanceLarge" />
+	</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/textAppearanceLarge" />
+	</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/redled" />
+
+		<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/textAppearanceLarge" />
+	</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/redled" />
+
+		<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/textAppearanceLarge" />
+	</RelativeLayout>
+
+</LinearLayout>
diff --git a/altosdroid/res/layout/tab_landed.xml b/altosdroid/res/layout/tab_landed.xml
new file mode 100644
index 00000000..b5c8d8c2
--- /dev/null
+++ b/altosdroid/res/layout/tab_landed.xml
@@ -0,0 +1,169 @@
+<?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/textAppearanceLarge" />
+	</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/textAppearanceLarge" />
+	</RelativeLayout>
+
+	<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/textAppearanceLarge" />
+	</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/textAppearanceLarge" />
+	</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/textAppearanceLarge" />
+	</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/textAppearanceLarge" />
+	</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/textAppearanceLarge" />
+	</RelativeLayout>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/altosdroid/res/layout/tab_map.xml b/altosdroid/res/layout/tab_map.xml
new file mode 100644
index 00000000..4737fae0
--- /dev/null
+++ b/altosdroid/res/layout/tab_map.xml
@@ -0,0 +1,22 @@
+<?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.
+-->
+<fragment xmlns:android="http://schemas.android.com/apk/res/android"
+	android:id="@+id/map"
+	android:layout_width="match_parent"
+	android:layout_height="match_parent"
+	class="com.google.android.gms.maps.SupportMapFragment"/>
diff --git a/altosdroid/res/layout/tab_pad.xml b/altosdroid/res/layout/tab_pad.xml
new file mode 100644
index 00000000..f5ec46b5
--- /dev/null
+++ b/altosdroid/res/layout/tab_pad.xml
@@ -0,0 +1,320 @@
+<?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:layout_weight="0"
+	android:orientation="vertical" >
+
+	<RelativeLayout
+		android:layout_width="wrap_content"
+		android:layout_height="wrap_content" >
+
+		<ImageView
+			android:id="@+id/battery_redled"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:contentDescription="@string/battery_voltage_label"
+			android:src="@drawable/redled" />
+
+		<ImageView
+			android:id="@+id/battery_greenled"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:layout_toRightOf="@id/battery_redled"
+			android:contentDescription="@string/battery_voltage_label"
+			android:paddingRight="5dp"
+			android:src="@drawable/grayled" />
+
+		<TextView
+			android:id="@+id/battery_voltage_label"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:layout_toRightOf="@id/battery_greenled"
+			android:text="@string/battery_voltage_label" />
+
+		<TextView
+			android:id="@+id/battery_voltage_value"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:layout_below="@id/battery_voltage_label"
+			android:layout_toRightOf="@id/battery_greenled"
+			android:text=""
+			android:textAppearance="?android:attr/textAppearanceLarge" />
+	</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/redled" />
+
+		<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_below="@id/apogee_voltage_label"
+			android:layout_toRightOf="@id/apogee_greenled"
+			android:text=""
+			android:textAppearance="?android:attr/textAppearanceLarge" />
+	</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/redled" />
+
+		<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_below="@id/main_voltage_label"
+			android:layout_toRightOf="@id/main_greenled"
+			android:text=""
+			android:textAppearance="?android:attr/textAppearanceLarge" />
+	</RelativeLayout>
+
+	<RelativeLayout
+		android:layout_width="wrap_content"
+		android:layout_height="wrap_content"
+		android:paddingTop="5dp" >
+
+		<ImageView
+			android:id="@+id/logging_redled"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:contentDescription="@string/logging_label"
+			android:src="@drawable/redled" />
+
+		<ImageView
+			android:id="@+id/logging_greenled"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:layout_toRightOf="@id/logging_redled"
+			android:contentDescription="@string/logging_label"
+			android:paddingRight="5dp"
+			android:src="@drawable/grayled" />
+
+		<TextView
+			android:id="@+id/logging_label"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:layout_toRightOf="@id/logging_greenled"
+			android:text="@string/logging_label" />
+
+		<TextView
+			android:id="@+id/logging_value"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:layout_below="@id/logging_label"
+			android:layout_toRightOf="@id/logging_greenled"
+			android:text=""
+			android:textAppearance="?android:attr/textAppearanceLarge" />
+	</RelativeLayout>
+
+	<RelativeLayout
+		android:layout_width="wrap_content"
+		android:layout_height="wrap_content"
+		android:paddingTop="5dp" >
+
+		<ImageView
+			android:id="@+id/gps_locked_redled"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:contentDescription="@string/gps_locked_label"
+			android:src="@drawable/redled" />
+
+		<ImageView
+			android:id="@+id/gps_locked_greenled"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:layout_toRightOf="@id/gps_locked_redled"
+			android:contentDescription="@string/gps_locked_label"
+			android:paddingRight="5dp"
+			android:src="@drawable/grayled" />
+
+		<TextView
+			android:id="@+id/gps_locked_label"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:layout_toRightOf="@id/gps_locked_greenled"
+			android:text="@string/gps_locked_label" />
+
+		<TextView
+			android:id="@+id/gps_locked_value"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:layout_below="@id/gps_locked_label"
+			android:layout_toRightOf="@id/gps_locked_greenled"
+			android:text=""
+			android:textAppearance="?android:attr/textAppearanceLarge" />
+	</RelativeLayout>
+
+	<RelativeLayout
+		android:layout_width="wrap_content"
+		android:layout_height="wrap_content"
+		android:paddingTop="5dp" >
+
+		<ImageView
+			android:id="@+id/gps_ready_redled"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:contentDescription="@string/gps_ready_label"
+			android:src="@drawable/redled" />
+
+		<ImageView
+			android:id="@+id/gps_ready_greenled"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:layout_toRightOf="@id/gps_ready_redled"
+			android:contentDescription="@string/gps_ready_label"
+			android:paddingRight="5dp"
+			android:src="@drawable/grayled" />
+
+		<TextView
+			android:id="@+id/gps_ready_label"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:layout_toRightOf="@id/gps_ready_greenled"
+			android:text="@string/gps_ready_label" />
+
+		<TextView
+			android:id="@+id/gps_ready_value"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:layout_below="@id/gps_ready_label"
+			android:layout_toRightOf="@id/gps_ready_greenled"
+			android:text=""
+			android:textAppearance="?android:attr/textAppearanceLarge" />
+	</RelativeLayout>
+
+	<RelativeLayout
+		android:layout_width="wrap_content"
+		android:layout_height="wrap_content"
+		android:paddingLeft="69dp"
+		android:paddingTop="5dp" >
+
+		<TextView
+			android:id="@+id/pad_lat_label"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:layout_toRightOf="@id/gps_ready_greenled"
+			android:text="@string/pad_lat_label" />
+
+		<TextView
+			android:id="@+id/pad_lat_value"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:layout_below="@id/pad_lat_label"
+			android:layout_toRightOf="@id/gps_ready_greenled"
+			android:text=""
+			android:textAppearance="?android:attr/textAppearanceLarge" />
+	</RelativeLayout>
+
+	<RelativeLayout
+		android:layout_width="wrap_content"
+		android:layout_height="wrap_content"
+		android:paddingLeft="69dp"
+		android:paddingTop="5dp" >
+
+		<TextView
+			android:id="@+id/pad_lon_label"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:layout_toRightOf="@id/gps_ready_greenled"
+			android:text="@string/pad_lon_label" />
+
+		<TextView
+			android:id="@+id/pad_lon_value"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:layout_below="@id/pad_lon_label"
+			android:layout_toRightOf="@id/gps_ready_greenled"
+			android:text=""
+			android:textAppearance="?android:attr/textAppearanceLarge" />
+	</RelativeLayout>
+
+	<RelativeLayout
+		android:layout_width="wrap_content"
+		android:layout_height="wrap_content"
+		android:paddingLeft="69dp"
+		android:paddingTop="5dp" >
+
+		<TextView
+			android:id="@+id/pad_alt_label"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:layout_toRightOf="@id/gps_ready_greenled"
+			android:text="@string/pad_alt_label" />
+
+		<TextView
+			android:id="@+id/pad_alt_value"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:layout_below="@id/pad_alt_label"
+			android:layout_toRightOf="@id/gps_ready_greenled"
+			android:text=""
+			android:textAppearance="?android:attr/textAppearanceLarge" />
+	</RelativeLayout>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/altosdroid/res/values/strings.xml b/altosdroid/res/values/strings.xml
index 679dc019..639611c2 100644
--- a/altosdroid/res/values/strings.xml
+++ b/altosdroid/res/values/strings.xml
@@ -44,18 +44,36 @@
 	<string name="telemetry_service_stopped">Telemetry Service Stopped</string>
 
 	<!-- UI fields -->
+	<!-- Header -->
 	<string name="callsign_label">Callsign</string>
 	<string name="serial_label">Serial</string>
 	<string name="flight_label">Flight</string>
 	<string name="state_label">State</string>
 	<string name="rssi_label">RSSI</string>
+	<string name="age_label">Age</string>
+
+	<!-- Tab fields -->
 	<string name="height_label">Height</string>
 	<string name="speed_label">Speed</string>
 	<string name="accel_label">Acceleration</string>
 	<string name="bearing_label">Bearing</string>
 	<string name="elevation_label">Elevation</string>
 	<string name="range_label">Range</string>
+	<string name="distance_label">Distance</string>
+	<string name="gnd_distance_label">Ground Distance</string>
+	<string name="max_height_label">Max Height</string>
+	<string name="max_speed_label">Max Speed</string>
+	<string name="max_accel_label">Max Accel</string>
+	<string name="battery_voltage_label">Battery Voltage</string>
+	<string name="apogee_voltage_label">Apogee Igniter Voltage</string>
+	<string name="main_voltage_label">Main Igniter Voltage</string>
+	<string name="logging_label">On-board Data Logging</string>
+	<string name="gps_locked_label">GPS Locked</string>
+	<string name="gps_ready_label">GPS Ready</string>
 	<string name="latitude_label">Latitude</string>
 	<string name="longitude_label">Longitude</string>
+	<string name="pad_lat_label">Pad Latitude</string>
+	<string name="pad_lon_label">Pad Longitude</string>
+	<string name="pad_alt_label">Pad Altitude</string>
 
 </resources>
-- 
cgit v1.2.3