X-Git-Url: https://git.gag.com/?a=blobdiff_plain;ds=sidebyside;f=altosdroid%2Fres%2Flayout%2Ftab_flight.xml;h=36d277d7cc962ebb79617bdbe1581b863d3e0e28;hb=4a257455b2dc57069c41e1845daf66239c5cbe1d;hp=4fa026cab354b1d5b38f4589d232a895d4850831;hpb=2b6768ed32d7be444c49caa40d30b520177bb22a;p=fw%2Faltos

diff --git a/altosdroid/res/layout/tab_flight.xml b/altosdroid/res/layout/tab_flight.xml
index 4fa026ca..36d277d7 100644
--- a/altosdroid/res/layout/tab_flight.xml
+++ b/altosdroid/res/layout/tab_flight.xml
@@ -4,7 +4,8 @@
 
      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.
+     the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
 
      This program is distributed in the hope that it will be useful, but
      WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -15,377 +16,388 @@
      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"
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="fill_parent"
+    android:layout_height="wrap_content"
+    android:orientation="vertical" >
+
+  <LinearLayout
+      android:layout_weight="0"
+      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: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="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:id="@+id/apogee_view"
+	android:visibility="gone"
+	android:layout_gravity="fill"
+	android:layout_weight="1"
+	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:text=""
+	  android:textAppearance="?android:attr/textAppearanceSmall" />
+    </RelativeLayout>
+
+    <RelativeLayout
+	android:id="@+id/main_view"
+	android:visibility="gone"
+	android:layout_gravity="fill"
+	android:layout_weight="1"
+	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:text=""
+	  android:textAppearance="?android:attr/textAppearanceSmall" />
+    </RelativeLayout>
+  </LinearLayout>
 </LinearLayout>