X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=altosdroid%2Fres%2Flayout%2Ftab_flight.xml;h=85c171b23711538059bfe8f423ad80eb1e03a88e;hp=27c903d06657146e63a50e9865d0ecf3dfc40580;hb=c4af5cb233013b35d6763f5adf8d11b47f847111;hpb=251263f72a1c189aac709d3d0410eb916a9f66d6

diff --git a/altosdroid/res/layout/tab_flight.xml b/altosdroid/res/layout/tab_flight.xml
index 27c903d0..85c171b2 100644
--- a/altosdroid/res/layout/tab_flight.xml
+++ b/altosdroid/res/layout/tab_flight.xml
@@ -22,379 +22,381 @@
     android:orientation="vertical" >
 
   <LinearLayout
-      xmlns:android="http://schemas.android.com/apk/res/android"
+      android:layout_weight="0"
       android:layout_width="fill_parent"
       android:layout_height="wrap_content"
-      android:layout_weight="0"
-      android:baselineAligned="true"
-      android:orientation="horizontal" >
+      android:orientation="vertical" >
 
-    <RelativeLayout
-	android:layout_width="0dp"
+    <LinearLayout
+	xmlns:android="http://schemas.android.com/apk/res/android"
+	android:layout_width="fill_parent"
 	android:layout_height="wrap_content"
-	android:layout_weight="1" >
+	android:layout_weight="0"
+	android:baselineAligned="true"
+	android:orientation="horizontal" >
 
-      <TextView
-	  android:id="@+id/speed_label"
-	  android:layout_width="wrap_content"
+      <RelativeLayout
+	  android:layout_width="0dp"
 	  android:layout_height="wrap_content"
-	  android:text="@string/speed_label" />
-
-      <TextView
-	  android:id="@+id/speed_value"
-	  android:layout_width="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_alignParentRight="true"
-	  android:layout_below="@id/speed_label"
-	  android:text=""
-	  android:textAppearance="?android:attr/textAppearanceSmall" />
-    </RelativeLayout>
-
-    <RelativeLayout
-	android:layout_width="0dp"
+	  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="1" >
+	android:layout_weight="0"
+	android:baselineAligned="true"
+	android:orientation="horizontal" >
 
-      <TextView
-	  android:id="@+id/height_label"
-	  android:layout_width="wrap_content"
+      <RelativeLayout
+	  android:layout_width="0dp"
 	  android:layout_height="wrap_content"
-	  android:text="@string/height_label" />
-
-      <TextView
-	  android:id="@+id/height_value"
-	  android:layout_width="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_alignParentRight="true"
-	  android:layout_below="@id/height_label"
-	  android:text=""
-	  android:textAppearance="?android:attr/textAppearanceSmall" />
-    </RelativeLayout>
-
-  </LinearLayout>
+	  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" >
 
-  <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/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"
+      <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="1" >
+	android:layout_weight="0"
+	android:baselineAligned="true"
+	android:orientation="horizontal"
+	android:paddingTop="5dp" >
 
-      <TextView
-	  android:id="@+id/max_speed_label"
-	  android:layout_width="wrap_content"
+      <RelativeLayout
+	  android:layout_width="0dp"
 	  android:layout_height="wrap_content"
-	  android:text="@string/max_speed_label" />
+	  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:id="@+id/max_speed_value"
-	  android:layout_width="wrap_content"
+	  android:layout_width="0dp"
 	  android:layout_height="wrap_content"
-	  android:layout_alignParentRight="true"
-	  android:layout_below="@id/max_speed_label"
-	  android:text=""
-	  android:textAppearance="?android:attr/textAppearanceSmall" />
-    </RelativeLayout>
+	  android:layout_weight="1" >
+      </TextView>
+
+    </LinearLayout>
 
     <RelativeLayout
-	android:layout_width="0dp"
+	android:layout_width="wrap_content"
 	android:layout_height="wrap_content"
-	android:layout_weight="1" >
+	android:paddingTop="5dp" >
 
       <TextView
-	  android:id="@+id/max_height_label"
+	  android:id="@+id/lat_label"
 	  android:layout_width="wrap_content"
 	  android:layout_height="wrap_content"
-	  android:text="@string/max_height_label" />
+	  android:text="@string/latitude_label" />
 
       <TextView
-	  android:id="@+id/max_height_value"
+	  android:id="@+id/lat_value"
 	  android:layout_width="wrap_content"
 	  android:layout_height="wrap_content"
 	  android:layout_alignParentRight="true"
-	  android:layout_below="@id/max_height_label"
+	  android:layout_below="@id/lat_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_width="wrap_content"
 	android:layout_height="wrap_content"
-	android:layout_weight="1" >
+	android:paddingTop="5dp" >
 
       <TextView
-	  android:id="@+id/elevation_label"
+	  android:id="@+id/lon_label"
 	  android:layout_width="wrap_content"
 	  android:layout_height="wrap_content"
-	  android:text="@string/elevation_label" />
+	  android:text="@string/longitude_label" />
 
       <TextView
-	  android:id="@+id/elevation_value"
+	  android:id="@+id/lon_value"
 	  android:layout_width="wrap_content"
 	  android:layout_height="wrap_content"
 	  android:layout_alignParentRight="true"
-	  android:layout_below="@id/elevation_label"
+	  android:layout_below="@id/lon_label"
 	  android:text=""
 	  android:textAppearance="?android:attr/textAppearanceSmall" />
     </RelativeLayout>
 
     <RelativeLayout
-	android:layout_width="0dp"
+	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:layout_weight="1" >
+	android:paddingTop="5dp" >
 
-      <TextView
-	  android:id="@+id/range_label"
+      <ImageView
+	  android:id="@+id/apogee_redled"
 	  android:layout_width="wrap_content"
 	  android:layout_height="wrap_content"
-	  android:text="@string/range_label" />
+	  android:contentDescription="@string/apogee_voltage_label"
+	  android:src="@drawable/grayled" />
 
-      <TextView
-	  android:id="@+id/range_value"
+      <ImageView
+	  android:id="@+id/apogee_greenled"
 	  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" >
+	  android:layout_toRightOf="@id/apogee_redled"
+	  android:contentDescription="@string/apogee_voltage_label"
+	  android:paddingRight="5dp"
+	  android:src="@drawable/grayled" />
 
       <TextView
-	  android:id="@+id/bearing_label"
+	  android:id="@+id/apogee_voltage_label"
 	  android:layout_width="wrap_content"
 	  android:layout_height="wrap_content"
-	  android:text="@string/bearing_label" />
+	  android:layout_toRightOf="@id/apogee_greenled"
+	  android:text="@string/apogee_voltage_label" />
 
       <TextView
-	  android:id="@+id/bearing_value"
+	  android:id="@+id/apogee_voltage_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: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:layout_weight="1" >
+	android:paddingTop="5dp" >
 
-      <TextView
-	  android:id="@+id/compass_label"
+      <ImageView
+	  android:id="@+id/main_redled"
 	  android:layout_width="wrap_content"
 	  android:layout_height="wrap_content"
-	  android:text="" />
+	  android:contentDescription="@string/main_voltage_label"
+	  android:src="@drawable/grayled" />
 
-      <TextView
-	  android:id="@+id/compass_value"
+      <ImageView
+	  android:id="@+id/main_greenled"
 	  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" >
+	  android:layout_toRightOf="@id/main_redled"
+	  android:contentDescription="@string/main_voltage_label"
+	  android:paddingRight="5dp"
+	  android:src="@drawable/grayled" />
 
       <TextView
-	  android:id="@+id/distance_label"
+	  android:id="@+id/main_voltage_label"
 	  android:layout_width="wrap_content"
 	  android:layout_height="wrap_content"
-	  android:text="@string/gnd_distance_label" />
+	  android:layout_toRightOf="@id/main_greenled"
+	  android:text="@string/main_voltage_label" />
 
       <TextView
-	  android:id="@+id/distance_value"
+	  android:id="@+id/main_voltage_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>