altosdroid: Add other igniter status, various other layout changes

Show the first four igniters (A-D) in the pad tab. Make pad and flight
layouts look a bit better

Signed-off-by: Keith Packard <keithp@keithp.com>

2 files changed, 843 insertions, 711 deletions

diff --git a/altosdroid/res/layout/tab_flight.xml b/altosdroid/res/layout/tab_flight.xml
index 4fa026ca..27c903d0 100644
--- a/altosdroid/res/layout/tab_flight.xml
+++ b/altosdroid/res/layout/tab_flight.xml
@@ -15,377 +15,386 @@
      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"
+<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: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>
+	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:visibility="gone"
+	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:visibility="gone"
+	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:visibility="gone"
+	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:visibility="gone"
+	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:visibility="gone"
+	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:visibility="gone"
+	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:visibility="gone"
+	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:visibility="gone"
+	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_pad.xml b/altosdroid/res/layout/tab_pad.xml
index 380eab91..f7a69f21 100644
--- a/altosdroid/res/layout/tab_pad.xml
+++ b/altosdroid/res/layout/tab_pad.xml
@@ -15,343 +15,466 @@
      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/grayled" />
-
-		<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/textAppearanceSmall" />
-	</RelativeLayout>
-
-	<RelativeLayout
-		android:layout_width="wrap_content"
-		android:layout_height="wrap_content" >
-
-		<ImageView
-			android:id="@+id/receiver_redled"
-			android:layout_width="wrap_content"
-			android:layout_height="wrap_content"
-			android:contentDescription="@string/receiver_voltage_label"
-			android:src="@drawable/grayled" />
-
-		<ImageView
-			android:id="@+id/receiver_greenled"
-			android:layout_width="wrap_content"
-			android:layout_height="wrap_content"
-			android:layout_toRightOf="@id/receiver_redled"
-			android:contentDescription="@string/receiver_voltage_label"
-			android:paddingRight="5dp"
-			android:src="@drawable/grayled" />
-
-		<TextView
-			android:id="@+id/receiver_voltage_label"
-			android:layout_width="wrap_content"
-			android:layout_height="wrap_content"
-			android:layout_toRightOf="@id/receiver_greenled"
-			android:text="@string/receiver_voltage_label" />
-
-		<TextView
-			android:id="@+id/receiver_voltage_value"
-			android:layout_width="wrap_content"
-			android:layout_height="wrap_content"
-			android:layout_below="@id/receiver_voltage_label"
-			android:layout_toRightOf="@id/receiver_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/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_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_below="@id/main_voltage_label"
-			android:layout_toRightOf="@id/main_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/logging_redled"
-			android:layout_width="wrap_content"
-			android:layout_height="wrap_content"
-			android:contentDescription="@string/logging_label"
-			android:src="@drawable/grayled" />
-
-		<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/textAppearanceSmall" />
-	</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/grayled" />
-
-		<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/textAppearanceSmall" />
-	</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/grayled" />
-
-		<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/textAppearanceSmall" />
-	</RelativeLayout>
-
-	<RelativeLayout
-		android:layout_width="wrap_content"
-		android:layout_height="wrap_content"
-		android:paddingLeft="69dp">
-
-		<TextView
-			android:id="@+id/pad_lat_label"
-			android:layout_width="wrap_content"
-			android:layout_height="wrap_content"
-			android:width="100sp"
-			android:paddingRight="10sp"
-			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_toRightOf="@id/pad_lat_label"
-			android:text=""
-			android:textAppearance="?android:attr/textAppearanceSmall" />
-	</RelativeLayout>
-
-	<RelativeLayout
-		android:layout_width="wrap_content"
-		android:layout_height="wrap_content"
-		android:paddingLeft="69dp">
-
-		<TextView
-			android:id="@+id/pad_lon_label"
-			android:layout_width="wrap_content"
-			android:layout_height="wrap_content"
-			android:width="100sp"
-			android:paddingRight="10sp"
-			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_toRightOf="@id/pad_lon_label"
-			android:text=""
-			android:textAppearance="?android:attr/textAppearanceSmall" />
-	</RelativeLayout>
-
-	<RelativeLayout
-		android:layout_width="wrap_content"
-		android:layout_height="wrap_content"
-		android:paddingLeft="69dp">
-
-		<TextView
-			android:id="@+id/pad_alt_label"
-			android:layout_width="wrap_content"
-			android:layout_height="wrap_content"
-			android:width="100sp"
-			android:paddingRight="10sp"
-			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_toRightOf="@id/pad_alt_label"
-			android:text=""
-			android:textAppearance="?android:attr/textAppearanceSmall" />
-	</RelativeLayout>
-
-</LinearLayout>
+
+<TableLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:stretchColumns="2,3"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content">
+
+  <TableRow
+      android:padding="2dip"
+      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/grayled"
+	/>
+
+    <ImageView
+	android:id="@+id/battery_greenled"
+	android:layout_width="wrap_content"
+	android:layout_height="wrap_content"
+	android:contentDescription="@string/battery_voltage_label"
+	android:src="@drawable/grayled" />
+
+    <TextView
+	android:id="@+id/battery_voltage_label"
+	android:layout_width="wrap_content"
+	android:layout_height="wrap_content"
+	android:text="@string/battery_voltage_label" />
+
+    <TextView
+	android:id="@+id/battery_voltage_value"
+	android:layout_width="wrap_content"
+	android:layout_height="wrap_content"
+	android:text=""
+	android:textAppearance="?android:attr/textAppearanceSmall"
+	/>
+  </TableRow>
+
+
+  <TableRow
+      android:padding="2dip"
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content">
+
+    <ImageView
+	android:visibility="gone"
+	android:id="@+id/receiver_redled"
+	android:layout_width="wrap_content"
+	android:layout_height="wrap_content"
+	android:contentDescription="@string/receiver_voltage_label"
+	android:src="@drawable/grayled" />
+
+    <ImageView
+	android:visibility="gone"
+	android:id="@+id/receiver_greenled"
+	android:layout_width="wrap_content"
+	android:layout_height="wrap_content"
+	android:contentDescription="@string/receiver_voltage_label"
+	android:src="@drawable/grayled" />
+
+    <TextView
+	android:visibility="gone"
+	android:id="@+id/receiver_voltage_label"
+	android:layout_width="wrap_content"
+	android:layout_height="wrap_content"
+	android:text="@string/receiver_voltage_label" />
+
+    <TextView
+	android:visibility="gone"
+	android:id="@+id/receiver_voltage_value"
+	android:layout_width="wrap_content"
+	android:layout_height="wrap_content"
+	android:text=""
+	android:textAppearance="?android:attr/textAppearanceSmall" />
+  </TableRow>
+
+  <TableRow
+      android:padding="2dip"
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content" >
+
+    <ImageView
+	android:id="@+id/logging_redled"
+	android:layout_width="wrap_content"
+	android:layout_height="wrap_content"
+	android:contentDescription="@string/logging_label"
+	android:src="@drawable/grayled" />
+
+    <ImageView
+	android:id="@+id/logging_greenled"
+	android:layout_width="wrap_content"
+	android:layout_height="wrap_content"
+	android:contentDescription="@string/logging_label"
+	android:src="@drawable/grayled" />
+
+    <TextView
+	android:id="@+id/logging_label"
+	android:layout_width="wrap_content"
+	android:layout_height="wrap_content"
+	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:text=""
+	android:textAppearance="?android:attr/textAppearanceSmall" />
+  </TableRow>
+
+  <TableRow
+      android:padding="2dip"
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content" >
+
+    <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/grayled" />
+
+    <ImageView
+	android:id="@+id/gps_locked_greenled"
+	android:layout_width="wrap_content"
+	android:layout_height="wrap_content"
+	android:contentDescription="@string/gps_locked_label"
+	android:src="@drawable/grayled" />
+
+    <TextView
+	android:id="@+id/gps_locked_label"
+	android:layout_width="wrap_content"
+	android:layout_height="wrap_content"
+	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:text=""
+	android:textAppearance="?android:attr/textAppearanceSmall" />
+  </TableRow>
+
+  <TableRow
+      android:padding="2dip"
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content" >
+
+    <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/grayled" />
+
+    <ImageView
+	android:id="@+id/gps_ready_greenled"
+	android:layout_width="wrap_content"
+	android:layout_height="wrap_content"
+	android:contentDescription="@string/gps_ready_label"
+	android:src="@drawable/grayled" />
+
+    <TextView
+	android:id="@+id/gps_ready_label"
+	android:layout_width="wrap_content"
+	android:layout_height="wrap_content"
+	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:text=""
+	android:textAppearance="?android:attr/textAppearanceSmall" />
+  </TableRow>
+
+  <TableRow
+      android:padding="2dip"
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content">
+
+    <ImageView
+	android:visibility="gone"
+	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:visibility="gone"
+	android:id="@+id/apogee_greenled"
+	android:layout_width="wrap_content"
+	android:layout_height="wrap_content"
+	android:contentDescription="@string/apogee_voltage_label"
+	android:src="@drawable/grayled" />
+
+    <TextView
+	android:visibility="gone"
+	android:id="@+id/apogee_voltage_label"
+	android:layout_width="wrap_content"
+	android:layout_height="wrap_content"
+	android:text="@string/apogee_voltage_label" />
+
+    <TextView
+	android:visibility="gone"
+	android:id="@+id/apogee_voltage_value"
+	android:layout_width="wrap_content"
+	android:layout_height="wrap_content"
+	android:text=""
+	android:textAppearance="?android:attr/textAppearanceSmall" />
+  </TableRow>
+
+  <TableRow
+      android:padding="2dip"
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content" >
+
+    <ImageView
+	android:visibility="gone"
+	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:visibility="gone"
+	android:id="@+id/main_greenled"
+	android:layout_width="wrap_content"
+	android:layout_height="wrap_content"
+	android:contentDescription="@string/main_voltage_label"
+	android:src="@drawable/grayled" />
+
+    <TextView
+	android:visibility="gone"
+	android:id="@+id/main_voltage_label"
+	android:layout_width="wrap_content"
+	android:layout_height="wrap_content"
+	android:text="@string/main_voltage_label" />
+
+    <TextView
+	android:visibility="gone"
+	android:id="@+id/main_voltage_value"
+	android:layout_width="wrap_content"
+	android:layout_height="wrap_content"
+	android:text=""
+	android:textAppearance="?android:attr/textAppearanceSmall" />
+  </TableRow>
+
+  <TableRow
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content" >
+
+    <ImageView
+	android:visibility="gone"
+	android:id="@+id/ignite_a_redled"
+	android:layout_width="wrap_content"
+	android:layout_height="wrap_content"
+	android:contentDescription="@string/ignite_a_voltage_label"
+	android:src="@drawable/grayled" />
+
+    <ImageView
+	android:visibility="gone"
+	android:id="@+id/ignite_a_greenled"
+	android:layout_width="wrap_content"
+	android:layout_height="wrap_content"
+	android:contentDescription="@string/ignite_a_voltage_label"
+	android:src="@drawable/grayled" />
+
+    <TextView
+	android:visibility="gone"
+	android:id="@+id/ignite_a_voltage_label"
+	android:layout_width="wrap_content"
+	android:layout_height="wrap_content"
+	android:text="@string/ignite_a_voltage_label" />
+
+    <TextView
+	android:visibility="gone"
+	android:id="@+id/ignite_a_voltage_value"
+	android:layout_width="wrap_content"
+	android:layout_height="wrap_content"
+	android:text=""
+	android:textAppearance="?android:attr/textAppearanceSmall" />
+  </TableRow>
+
+  <TableRow
+      android:padding="2dip"
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content" >
+
+    <ImageView
+	android:visibility="gone"
+	android:id="@+id/ignite_b_redled"
+	android:layout_width="wrap_content"
+	android:layout_height="wrap_content"
+	android:contentDescription="@string/ignite_b_voltage_label"
+	android:src="@drawable/grayled" />
+
+    <ImageView
+	android:visibility="gone"
+	android:id="@+id/ignite_b_greenled"
+	android:layout_width="wrap_content"
+	android:layout_height="wrap_content"
+	android:contentDescription="@string/ignite_b_voltage_label"
+	android:src="@drawable/grayled" />
+
+    <TextView
+	android:visibility="gone"
+	android:id="@+id/ignite_b_voltage_label"
+	android:layout_width="wrap_content"
+	android:layout_height="wrap_content"
+	android:text="@string/ignite_b_voltage_label" />
+
+    <TextView
+	android:visibility="gone"
+	android:id="@+id/ignite_b_voltage_value"
+	android:layout_width="wrap_content"
+	android:layout_height="wrap_content"
+	android:text=""
+	android:textAppearance="?android:attr/textAppearanceSmall" />
+  </TableRow>
+
+  <TableRow
+      android:padding="2dip"
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content" >
+
+    <ImageView
+	android:visibility="gone"
+	android:id="@+id/ignite_c_redled"
+	android:layout_width="wrap_content"
+	android:layout_height="wrap_content"
+	android:contentDescription="@string/ignite_c_voltage_label"
+	android:src="@drawable/grayled" />
+
+    <ImageView
+	android:visibility="gone"
+	android:id="@+id/ignite_c_greenled"
+	android:layout_width="wrap_content"
+	android:layout_height="wrap_content"
+	android:contentDescription="@string/ignite_c_voltage_label"
+	android:src="@drawable/grayled" />
+
+    <TextView
+	android:visibility="gone"
+	android:id="@+id/ignite_c_voltage_label"
+	android:layout_width="wrap_content"
+	android:layout_height="wrap_content"
+	android:text="@string/ignite_c_voltage_label" />
+
+    <TextView
+	android:visibility="gone"
+	android:id="@+id/ignite_c_voltage_value"
+	android:layout_width="wrap_content"
+	android:layout_height="wrap_content"
+	android:text=""
+	android:textAppearance="?android:attr/textAppearanceSmall" />
+  </TableRow>
+
+  <TableRow
+      android:padding="2dip"
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content" >
+
+    <ImageView
+	android:visibility="gone"
+	android:id="@+id/ignite_d_redled"
+	android:layout_width="wrap_content"
+	android:layout_height="wrap_content"
+	android:contentDescription="@string/ignite_d_voltage_label"
+	android:src="@drawable/grayled" />
+
+    <ImageView
+	android:visibility="gone"
+	android:id="@+id/ignite_d_greenled"
+	android:layout_width="wrap_content"
+	android:layout_height="wrap_content"
+	android:contentDescription="@string/ignite_d_voltage_label"
+	android:src="@drawable/grayled" />
+
+    <TextView
+	android:visibility="gone"
+	android:id="@+id/ignite_d_voltage_label"
+	android:layout_width="wrap_content"
+	android:layout_height="wrap_content"
+	android:text="@string/ignite_d_voltage_label" />
+
+    <TextView
+	android:visibility="gone"
+	android:id="@+id/ignite_d_voltage_value"
+	android:layout_width="wrap_content"
+	android:layout_height="wrap_content"
+	android:text=""
+	android:textAppearance="?android:attr/textAppearanceSmall" />
+  </TableRow>
+
+  <TableRow
+      android:padding="2dip"
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content">
+
+    <TextView
+	android:id="@+id/receiver_lat_label"
+	android:layout_width="wrap_content"
+	android:layout_height="wrap_content"
+	android:layout_column="2"
+	android:text="@string/receiver_latitude_label" />
+
+    <TextView
+	android:id="@+id/receiver_lat_value"
+	android:layout_width="wrap_content"
+	android:layout_height="wrap_content"
+	android:text=""
+	android:textAppearance="?android:attr/textAppearanceSmall" />
+  </TableRow>
+
+  <TableRow
+      android:padding="2dip"
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content">
+
+    <TextView
+	android:id="@+id/receiver_lon_label"
+	android:layout_width="wrap_content"
+	android:layout_height="wrap_content"
+	android:layout_column="2"
+	android:text="@string/receiver_longitude_label" />
+
+    <TextView
+	android:id="@+id/receiver_lon_value"
+	android:layout_width="wrap_content"
+	android:layout_height="wrap_content"
+	android:text=""
+	android:textAppearance="?android:attr/textAppearanceSmall" />
+  </TableRow>
+
+  <TableRow
+      android:padding="2dip"
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content">
+
+    <TextView
+	android:id="@+id/receiver_alt_label"
+	android:layout_width="wrap_content"
+	android:layout_height="wrap_content"
+	android:layout_column="2"
+	android:text="@string/receiver_altitude_label" />
+
+    <TextView
+	android:id="@+id/receiver_alt_value"
+	android:layout_width="wrap_content"
+	android:layout_height="wrap_content"
+	android:text=""
+	android:textAppearance="?android:attr/textAppearanceSmall" />
+  </TableRow>
+</TableLayout>