altosdroid: Show receiver battery voltage in the 'pad' view

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

diff --git a/altosdroid/res/layout/tab_pad.xml b/altosdroid/res/layout/tab_pad.xml
index a21f9bbbb05b271631c8d5c115ab725165937e79..380eab9104402bd5ad6d159f3b0d7f0c6cb81ee5 100644 (file)
--- a/altosdroid/res/layout/tab_pad.xml
+++ b/altosdroid/res/layout/tab_pad.xml
@@ -30,7 +30,7 @@
                        android:layout_width="wrap_content"
                        android:layout_height="wrap_content"
                        android:contentDescription="@string/battery_voltage_label"
-                       android:src="@drawable/redled" />
+                       android:src="@drawable/grayled" />
 
                <ImageView
                        android:id="@+id/battery_greenled"
@@ -58,6 +58,43 @@
                        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"
@@ -68,7 +105,7 @@
                        android:layout_width="wrap_content"
                        android:layout_height="wrap_content"
                        android:contentDescription="@string/apogee_voltage_label"
-                       android:src="@drawable/redled" />
+                       android:src="@drawable/grayled" />
 
                <ImageView
                        android:id="@+id/apogee_greenled"
@@ -106,7 +143,7 @@
                        android:layout_width="wrap_content"
                        android:layout_height="wrap_content"
                        android:contentDescription="@string/main_voltage_label"
-                       android:src="@drawable/redled" />
+                       android:src="@drawable/grayled" />
 
                <ImageView
                        android:id="@+id/main_greenled"
@@ -144,7 +181,7 @@
                        android:layout_width="wrap_content"
                        android:layout_height="wrap_content"
                        android:contentDescription="@string/logging_label"
-                       android:src="@drawable/redled" />
+                       android:src="@drawable/grayled" />
 
                <ImageView
                        android:id="@+id/logging_greenled"
@@ -182,7 +219,7 @@
                        android:layout_width="wrap_content"
                        android:layout_height="wrap_content"
                        android:contentDescription="@string/gps_locked_label"
-                       android:src="@drawable/redled" />
+                       android:src="@drawable/grayled" />
 
                <ImageView
                        android:id="@+id/gps_locked_greenled"
@@ -220,7 +257,7 @@
                        android:layout_width="wrap_content"
                        android:layout_height="wrap_content"
                        android:contentDescription="@string/gps_ready_label"
-                       android:src="@drawable/redled" />
+                       android:src="@drawable/grayled" />
 
                <ImageView
                        android:id="@+id/gps_ready_greenled"
@@ -251,14 +288,14 @@
        <RelativeLayout
                android:layout_width="wrap_content"
                android:layout_height="wrap_content"
-               android:paddingLeft="69dp"
-               android:paddingTop="5dp" >
+               android:paddingLeft="69dp">
 
                <TextView
                        android:id="@+id/pad_lat_label"
                        android:layout_width="wrap_content"
                        android:layout_height="wrap_content"
-                       android.paddingRight="4dp"
+                       android:width="100sp"
+                       android:paddingRight="10sp"
                        android:layout_toRightOf="@id/gps_ready_greenled"
                        android:text="@string/pad_lat_label" />
 
@@ -274,14 +311,14 @@
        <RelativeLayout
                android:layout_width="wrap_content"
                android:layout_height="wrap_content"
-               android:paddingLeft="69dp"
-               android:paddingTop="5dp" >
+               android:paddingLeft="69dp">
 
                <TextView
                        android:id="@+id/pad_lon_label"
                        android:layout_width="wrap_content"
                        android:layout_height="wrap_content"
-                       android.paddingRight="4dp"
+                       android:width="100sp"
+                       android:paddingRight="10sp"
                        android:layout_toRightOf="@id/gps_ready_greenled"
                        android:text="@string/pad_lon_label" />
 
@@ -297,14 +334,14 @@
        <RelativeLayout
                android:layout_width="wrap_content"
                android:layout_height="wrap_content"
-               android:paddingLeft="69dp"
-               android:paddingTop="5dp" >
+               android:paddingLeft="69dp">
 
                <TextView
                        android:id="@+id/pad_alt_label"
                        android:layout_width="wrap_content"
                        android:layout_height="wrap_content"
-                       android.paddingRight="4dp"
+                       android:width="100sp"
+                       android:paddingRight="10sp"
                        android:layout_toRightOf="@id/gps_ready_greenled"
                        android:text="@string/pad_alt_label" />
 
@@ -317,4 +354,4 @@
                        android:textAppearance="?android:attr/textAppearanceSmall" />
        </RelativeLayout>
 
-</LinearLayout>
\ No newline at end of file
+</LinearLayout>