altosdroid: rename azimuth/altitude to elevation/height respectively.

[fw/altos] / altosdroid / res / layout / altosdroid.xml

diff --git a/altosdroid/res/layout/altosdroid.xml b/altosdroid/res/layout/altosdroid.xml
index 33d89d52091725cbe962acab29ccdcf4769cb0d1..e4b4f605243043310b142bee2b0457bce726b2b7 100644 (file)
--- a/altosdroid/res/layout/altosdroid.xml
+++ b/altosdroid/res/layout/altosdroid.xml
@@ -92,23 +92,11 @@
                 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:layout_toLeftOf="@+id/speed_units"
                 android:text=""
                 android:textAppearance="?android:attr/textAppearanceLarge" />
 
-            <TextView
-                android:id="@+id/speed_units"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_alignBaseline="@id/speed_value"
-                android:layout_alignParentRight="true"
-                android:layout_below="@id/speed_label"
-                android:gravity="right"
-                android:paddingLeft="10dip"
-                android:text="@string/speed_units"
-                android:textAppearance="?android:attr/textAppearanceMedium" />
-
         </RelativeLayout>
 
         <RelativeLayout
@@ -129,22 +117,11 @@
                 android:id="@+id/accel_value"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
+                android:layout_alignParentRight="true"
                 android:layout_below="@+id/accel_label"
-                android:layout_toLeftOf="@+id/accel_units"
                 android:text=""
                 android:textAppearance="?android:attr/textAppearanceLarge" />
 
-            <TextView
-                android:id="@+id/accel_units"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_alignBaseline="@+id/accel_value"
-                android:layout_alignParentRight="true"
-                android:layout_below="@+id/accel_label"
-                android:gravity="right"
-                android:paddingLeft="10dip"
-                android:text="@string/accel_units"
-                android:textAppearance="?android:attr/textAppearanceMedium" />
         </RelativeLayout>
 
         <RelativeLayout
@@ -165,27 +142,15 @@
                 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:layout_toLeftOf="@+id/range_units"
                 android:text=""
                 android:textAppearance="?android:attr/textAppearanceLarge" />
 
-            <TextView
-                android:id="@+id/range_units"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_alignBaseline="@+id/range_value"
-                android:layout_alignParentRight="true"
-                android:layout_below="@+id/range_label"
-                android:gravity="right"
-                android:paddingLeft="10dip"
-                android:text="@string/range_units"
-                android:textAppearance="?android:attr/textAppearanceMedium" />
-
         </RelativeLayout>
 
         <RelativeLayout
-            android:id="@+id/altitude_container"
+            android:id="@+id/height_container"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_alignParentRight="true"
@@ -193,35 +158,23 @@
             android:layout_toRightOf="@id/strut" >
 
             <TextView
-                android:id="@+id/altitude_label"
+                android:id="@+id/height_label"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:text="@string/altitude_label" />
+                android:text="@string/height_label" />
 
             <TextView
-                android:id="@+id/altitude_value"
+                android:id="@+id/height_value"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_below="@+id/altitude_label"
-                android:layout_toLeftOf="@+id/altitude_units"
+                android:layout_alignParentRight="true"
+                android:layout_below="@+id/height_label"
                 android:text=""
                 android:textAppearance="?android:attr/textAppearanceLarge" />
-
-            <TextView
-                android:id="@+id/altitude_units"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_alignBaseline="@+id/altitude_value"
-                android:layout_alignParentRight="true"
-                android:layout_below="@+id/altitude_label"
-                android:gravity="right"
-                android:paddingLeft="10dip"
-                android:text="@string/altitude_units"
-                android:textAppearance="?android:attr/textAppearanceMedium" />
         </RelativeLayout>
 
         <RelativeLayout
-            android:id="@+id/azimuth_container"
+            android:id="@+id/elevation_container"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_alignParentLeft="true"
@@ -229,30 +182,19 @@
             android:layout_toLeftOf="@id/strut" >
 
             <TextView
-                android:id="@+id/azimuth_label"
+                android:id="@+id/elevation_label"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:text="@string/azimuth_label" />
+                android:text="@string/elevation_label" />
 
             <TextView
-                android:id="@+id/azimuth_value"
+                android:id="@+id/elevation_value"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_below="@+id/azimuth_label"
-                android:layout_toLeftOf="@+id/azimuth_units"
+                android:layout_alignParentRight="true"
+                android:layout_below="@+id/elevation_label"
                 android:text=""
                 android:textAppearance="?android:attr/textAppearanceLarge" />
-
-            <TextView
-                android:id="@+id/azimuth_units"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_alignParentRight="true"
-                android:layout_below="@+id/azimuth_label"
-                android:gravity="right"
-                android:paddingLeft="10dip"
-                android:text="@string/azimuth_units"
-                android:textAppearance="?android:attr/textAppearanceMedium" />
         </RelativeLayout>
 
         <RelativeLayout
@@ -260,7 +202,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_alignParentRight="true"
-            android:layout_below="@+id/altitude_container"
+            android:layout_below="@+id/range_container"
             android:layout_toRightOf="@+id/strut" >
 
             <TextView
@@ -273,28 +215,18 @@
                 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:layout_toLeftOf="@+id/bearing_units"
                 android:text=""
                 android:textAppearance="?android:attr/textAppearanceLarge" />
 
-            <TextView
-                android:id="@+id/bearing_units"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_alignParentRight="true"
-                android:layout_below="@+id/bearing_label"
-                android:gravity="right"
-                android:paddingLeft="10dip"
-                android:text="@string/bearing_units"
-                android:textAppearance="?android:attr/textAppearanceMedium" />
         </RelativeLayout>
 
         <RelativeLayout
             android:id="@+id/latitude_container"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_below="@+id/azimuth_container" >
+            android:layout_below="@+id/elevation_container" >
 
             <TextView
                 android:id="@+id/latitude_label"