From 7bfa8841b65707d629b425b306ec4cc3acfc156c Mon Sep 17 00:00:00 2001
From: Keith Packard <keithp@keithp.com>
Date: Mon, 27 Apr 2015 21:20:22 -0700
Subject: altosdroid: Add USB support for TeleDongle/TeleBT

This lets AltosDroid use a USB-connected receiver as well as Bluetooth devices.

Signed-off-by: Keith Packard <keithp@keithp.com>
---
 altosdroid/res/values/CustomTheme.xml | 7 +++++++
 altosdroid/res/xml/device_filter.xml  | 6 ++++++
 2 files changed, 13 insertions(+)
 create mode 100644 altosdroid/res/values/CustomTheme.xml
 create mode 100644 altosdroid/res/xml/device_filter.xml

(limited to 'altosdroid/res')

diff --git a/altosdroid/res/values/CustomTheme.xml b/altosdroid/res/values/CustomTheme.xml
new file mode 100644
index 00000000..4daed1f8
--- /dev/null
+++ b/altosdroid/res/values/CustomTheme.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<resources>
+  <style name="CustomTheme" parent="android:Theme">
+    <item name="android:windowNoTitle">false</item>
+  </style>
+</resources>
diff --git a/altosdroid/res/xml/device_filter.xml b/altosdroid/res/xml/device_filter.xml
new file mode 100644
index 00000000..84b09c06
--- /dev/null
+++ b/altosdroid/res/xml/device_filter.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<resources>
+  <usb-device vendor-id="65534" />
+  <usb-device vendor-id="1027" />
+</resources>
-- 
cgit v1.2.3


From 1cc1900e13d79e0451587439c23bbb062d86cee3 Mon Sep 17 00:00:00 2001
From: Keith Packard <keithp@keithp.com>
Date: Mon, 27 Apr 2015 22:29:45 -0700
Subject: altosdroid: Fix tab label height problems

With a newer android API versions, we can set the indicator to a View
instead of just a string. This lets us wrap the desired string in a
TextView and show just that for the indicator, making it exactly the
right size.

Signed-off-by: Keith Packard <keithp@keithp.com>
---
 altosdroid/res/layout/tab_layout.xml               | 16 +++++++++
 .../src/org/altusmetrum/AltosDroid/AltosDroid.java | 41 ++++++++--------------
 2 files changed, 31 insertions(+), 26 deletions(-)
 create mode 100644 altosdroid/res/layout/tab_layout.xml

(limited to 'altosdroid/res')

diff --git a/altosdroid/res/layout/tab_layout.xml b/altosdroid/res/layout/tab_layout.xml
new file mode 100644
index 00000000..2c21c648
--- /dev/null
+++ b/altosdroid/res/layout/tab_layout.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/customTabLayout"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+    <TextView
+        android:id="@+id/tabLabel"
+        android:layout_height="wrap_content"
+        android:layout_width="match_parent"
+        android:textSize="13dp"
+        android:textColor="#ffffff"
+	android:gravity="center_horizontal"
+	android:background="#808080"
+        android:layout_centerVertical="true"
+        android:layout_centerHorizontal="true" />
+</RelativeLayout>
diff --git a/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java b/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java
index 27ebf206..b4fc3bc3 100644
--- a/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java
+++ b/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java
@@ -37,6 +37,7 @@ import android.os.Handler;
 import android.os.Message;
 import android.os.Messenger;
 import android.os.RemoteException;
+import android.content.res.Resources;
 import android.support.v4.app.FragmentActivity;
 import android.support.v4.app.FragmentManager;
 import android.util.DisplayMetrics;
@@ -46,6 +47,7 @@ import android.view.MenuInflater;
 import android.view.MenuItem;
 import android.view.Window;
 import android.view.View;
+import android.view.LayoutInflater;
 import android.widget.TabHost;
 import android.widget.TextView;
 import android.widget.RelativeLayout;
@@ -407,6 +409,14 @@ public class AltosDroid extends FragmentActivity implements AltosUnitsListener {
 		return String.format(format, value);
 	}
 
+	private View create_tab_view(String label) {
+		LayoutInflater inflater = (LayoutInflater) this.getLayoutInflater();
+		View tab_view = inflater.inflate(R.layout.tab_layout, null);
+		TextView text_view = (TextView) tab_view.findViewById (R.id.tabLabel);
+		text_view.setText(label);
+		return tab_view;
+	}
+
 	@Override
 	public void onCreate(Bundle savedInstanceState) {
 		super.onCreate(savedInstanceState);
@@ -428,32 +438,11 @@ public class AltosDroid extends FragmentActivity implements AltosUnitsListener {
 
 		mTabsAdapter = new TabsAdapter(this, mTabHost, mViewPager);
 
-		mTabsAdapter.addTab(mTabHost.newTabSpec("pad").setIndicator("Pad"), TabPad.class, null);
-		mTabsAdapter.addTab(mTabHost.newTabSpec("ascent").setIndicator("Ascent"), TabAscent.class, null);
-		mTabsAdapter.addTab(mTabHost.newTabSpec("descent").setIndicator("Descent"), TabDescent.class, null);
-		mTabsAdapter.addTab(mTabHost.newTabSpec("landed").setIndicator("Landed"), TabLanded.class, null);
-		mTabsAdapter.addTab(mTabHost.newTabSpec("map").setIndicator("Map"), TabMap.class, null);
-
-
-		// Scale the size of the Tab bar for different screen densities
-		// This probably won't be needed when we start supporting ICS+ tabs.
-		DisplayMetrics metrics = new DisplayMetrics();
-		getWindowManager().getDefaultDisplay().getMetrics(metrics);
-		int density = metrics.densityDpi;
-
-		if (density==DisplayMetrics.DENSITY_XHIGH)
-			tabHeight = 65;
-		else if (density==DisplayMetrics.DENSITY_HIGH)
-			tabHeight = 45;
-		else if (density==DisplayMetrics.DENSITY_MEDIUM)
-			tabHeight = 35;
-		else if (density==DisplayMetrics.DENSITY_LOW)
-			tabHeight = 25;
-		else
-			tabHeight = 65;
-
-		for (int i = 0; i < 5; i++)
-			mTabHost.getTabWidget().getChildAt(i).getLayoutParams().height = tabHeight;
+		mTabsAdapter.addTab(mTabHost.newTabSpec("pad").setIndicator(create_tab_view("Pad")), TabPad.class, null);
+		mTabsAdapter.addTab(mTabHost.newTabSpec("ascent").setIndicator(create_tab_view("Ascent")), TabAscent.class, null);
+		mTabsAdapter.addTab(mTabHost.newTabSpec("descent").setIndicator(create_tab_view("Descent")), TabDescent.class, null);
+		mTabsAdapter.addTab(mTabHost.newTabSpec("landed").setIndicator(create_tab_view("Landed")), TabLanded.class, null);
+		mTabsAdapter.addTab(mTabHost.newTabSpec("map").setIndicator(create_tab_view("Map")), TabMap.class, null);
 
 		// Set up the custom title
 		mTitle = (TextView) findViewById(R.id.title_left_text);
-- 
cgit v1.2.3


From 85013045ca505096064aaf45c312b158d0263d2a Mon Sep 17 00:00:00 2001
From: Keith Packard <keithp@keithp.com>
Date: Thu, 28 May 2015 01:05:18 -0700
Subject: altosdroid: Add map types and map preloading UIs

This adds an ugly dialog to select which maps to preload, and also
adds the ability to display other map types.

Signed-off-by: Keith Packard <keithp@keithp.com>
---
 altosdroid/AndroidManifest.xml                     |  10 +
 .../ic_maps_indicator_current_position.png         | Bin 0 -> 2079 bytes
 .../ic_maps_indicator_current_position.png         | Bin 0 -> 1205 bytes
 altosdroid/res/layout/device_list.xml              |  16 +-
 altosdroid/res/layout/map_preload.xml              | 129 +++++++++
 altosdroid/res/layout/map_type.xml                 |  47 +++
 altosdroid/res/menu/option_menu.xml                |  28 +-
 altosdroid/res/values/strings.xml                  |  20 ++
 .../src/org/altusmetrum/AltosDroid/AltosDroid.java |  24 ++
 .../org/altusmetrum/AltosDroid/AltosDroidTab.java  |   3 +
 .../altusmetrum/AltosDroid/MapTypeActivity.java    |  84 ++++++
 .../altusmetrum/AltosDroid/PreloadMapActivity.java | 322 +++++++++++++++++++++
 .../src/org/altusmetrum/AltosDroid/TabMap.java     |  13 +
 .../org/altusmetrum/AltosDroid/TabMapOffline.java  |  11 +-
 .../altusmetrum/AltosDroid/TelemetryService.java   |   1 -
 15 files changed, 688 insertions(+), 20 deletions(-)
 create mode 100644 altosdroid/res/drawable-hdpi/ic_maps_indicator_current_position.png
 create mode 100644 altosdroid/res/drawable-mdpi/ic_maps_indicator_current_position.png
 create mode 100644 altosdroid/res/layout/map_preload.xml
 create mode 100644 altosdroid/res/layout/map_type.xml
 create mode 100644 altosdroid/src/org/altusmetrum/AltosDroid/MapTypeActivity.java
 create mode 100644 altosdroid/src/org/altusmetrum/AltosDroid/PreloadMapActivity.java

(limited to 'altosdroid/res')

diff --git a/altosdroid/AndroidManifest.xml b/altosdroid/AndroidManifest.xml
index 71c6fb12..592373d4 100644
--- a/altosdroid/AndroidManifest.xml
+++ b/altosdroid/AndroidManifest.xml
@@ -72,6 +72,16 @@
                   android:theme="@android:style/Theme.Dialog"
                   android:configChanges="orientation|keyboardHidden" />
 
+        <activity android:name=".PreloadMapActivity"
+                  android:label="@string/preload_maps"
+                  android:theme="@android:style/Theme.Dialog"
+                  android:configChanges="orientation|keyboardHidden" />
+
+        <activity android:name=".MapTypeActivity"
+                  android:label="@string/map_type"
+                  android:theme="@android:style/Theme.Dialog"
+                  android:configChanges="orientation|keyboardHidden" />
+
         <service android:name=".TelemetryService" />
 
         <meta-data android:name="com.google.android.maps.v2.API_KEY"
diff --git a/altosdroid/res/drawable-hdpi/ic_maps_indicator_current_position.png b/altosdroid/res/drawable-hdpi/ic_maps_indicator_current_position.png
new file mode 100644
index 00000000..bc9160df
Binary files /dev/null and b/altosdroid/res/drawable-hdpi/ic_maps_indicator_current_position.png differ
diff --git a/altosdroid/res/drawable-mdpi/ic_maps_indicator_current_position.png b/altosdroid/res/drawable-mdpi/ic_maps_indicator_current_position.png
new file mode 100644
index 00000000..4e427d89
Binary files /dev/null and b/altosdroid/res/drawable-mdpi/ic_maps_indicator_current_position.png differ
diff --git a/altosdroid/res/layout/device_list.xml b/altosdroid/res/layout/device_list.xml
index 93d65517..bf295e4c 100644
--- a/altosdroid/res/layout/device_list.xml
+++ b/altosdroid/res/layout/device_list.xml
@@ -32,6 +32,13 @@
         android:textColor="#fff"
         android:paddingLeft="5dp"
     />
+    <ListView android:id="@+id/new_devices"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_weight="1"
+	android:fadeScrollbars="false"
+	android:scrollbars="vertical"
+    />
     <TextView android:id="@+id/title_paired_devices"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
@@ -44,13 +51,8 @@
     <ListView android:id="@+id/paired_devices"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:stackFromBottom="true"
         android:layout_weight="1"
-    />
-    <ListView android:id="@+id/new_devices"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:stackFromBottom="true"
-        android:layout_weight="2"
+	android:fadeScrollbars="false"
+	android:scrollbars="vertical"
     />
 </LinearLayout>
diff --git a/altosdroid/res/layout/map_preload.xml b/altosdroid/res/layout/map_preload.xml
new file mode 100644
index 00000000..1d1fca32
--- /dev/null
+++ b/altosdroid/res/layout/map_preload.xml
@@ -0,0 +1,129 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  Copyright © 2015 Keith Packard <keithp@keithp.com>
+
+  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.
+
+  This program is distributed in the hope that it will be useful, but
+  WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+  General Public License for more details.
+
+  You should have received a copy of the GNU General Public License along
+  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:orientation="vertical"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    >
+  <ScrollView android:layout_width="fill_parent"
+	      android:layout_height="wrap_content">
+    <LinearLayout android:layout_width="wrap_content"
+		  android:layout_height="wrap_content"
+                  android:orientation="vertical">
+      <TextView android:id="@+id/preload_site_label"
+		android:layout_width="fill_parent"
+		android:layout_height="wrap_content"
+		android:text="@string/preload_site_label"
+		/>
+      <Spinner android:id="@+id/preload_site_list"
+	       android:layout_width="fill_parent"
+	       android:layout_height="wrap_content"
+	       android:prompt="@string/preload_site_label"
+	       android:spinnerMode="dropdown"
+	       />
+      <TextView android:id="@+id/preload_latitude_label"
+		android:layout_width="fill_parent"
+		android:layout_height="wrap_content"
+		android:text="@string/preload_latitude_label"
+		/>
+      <EditText android:id="@+id/preload_latitude"
+		android:layout_width="fill_parent"
+		android:layout_height="wrap_content"
+		android:hint="@string/preload_latitude_label"
+		android:inputType="number"/>
+      <TextView android:id="@+id/preload_longitude_label"
+		android:layout_width="fill_parent"
+		android:layout_height="wrap_content"
+		android:text="@string/preload_longitude_label"
+		/>
+      <EditText android:id="@+id/preload_longitude"
+		android:layout_width="fill_parent"
+		android:layout_height="wrap_content"
+		android:hint="@string/preload_longitude_label"
+		android:inputType="number"/>
+      <TextView android:id="@+id/preload_types"
+		android:layout_width="fill_parent"
+		android:layout_height="wrap_content"
+		android:text="@string/preload_types"
+		/>
+      <CheckBox android:id="@+id/preload_hybrid"
+		android:layout_width="fill_parent"
+		android:layout_height="wrap_content"
+		android:text="@string/preload_hybrid"
+		/>
+      <CheckBox android:id="@+id/preload_satellite"
+		android:layout_width="fill_parent"
+		android:layout_height="wrap_content"
+		android:text="@string/preload_satellite"
+		/>
+      <CheckBox android:id="@+id/preload_roadmap"
+		android:layout_width="fill_parent"
+		android:layout_height="wrap_content"
+		android:text="@string/preload_roadmap"
+		/>
+      <CheckBox android:id="@+id/preload_terrain"
+		android:layout_width="fill_parent"
+		android:layout_height="wrap_content"
+		android:text="@string/preload_terrain"
+		/>
+      <TextView android:id="@+id/preload_min_zoom_label"
+		android:layout_width="fill_parent"
+		android:layout_height="wrap_content"
+		android:text="@string/preload_min_zoom"
+		/>
+      <Spinner android:id="@+id/preload_min_zoom"
+	       android:layout_width="fill_parent"
+	       android:layout_height="wrap_content"
+	       android:prompt="@string/preload_min_zoom"
+	       android:spinnerMode="dropdown"
+	       />
+      <TextView android:id="@+id/preload_max_zoom_label"
+		android:layout_width="fill_parent"
+		android:layout_height="wrap_content"
+		android:text="@string/preload_max_zoom"
+		/>
+      <Spinner android:id="@+id/preload_max_zoom"
+	       android:layout_width="fill_parent"
+	       android:layout_height="wrap_content"
+	       android:prompt="@string/preload_max_zoom"
+	       android:spinnerMode="dropdown"
+	       />
+      <TextView android:id="@+id/preload_tile_radius_label"
+		android:layout_width="fill_parent"
+		android:layout_height="wrap_content"
+		android:text="@string/preload_tile_radius"
+		/>
+      <Spinner android:id="@+id/preload_tile_radius"
+	       android:layout_width="fill_parent"
+	       android:layout_height="wrap_content"
+	       android:prompt="@string/preload_tile_radius"
+	       android:spinnerMode="dropdown"
+	       />
+      <Button android:id="@+id/preload_load"
+              android:layout_width="match_parent"
+              android:layout_height="wrap_content"
+              android:text="@string/preload_load"
+	      />
+      <ProgressBar android:id="@+id/preload_progress"
+		   android:layout_width="match_parent"
+		   android:layout_height="wrap_content"
+		   style="@android:style/Widget.ProgressBar.Horizontal"
+		   />
+    </LinearLayout>
+  </ScrollView>
+</LinearLayout>
diff --git a/altosdroid/res/layout/map_type.xml b/altosdroid/res/layout/map_type.xml
new file mode 100644
index 00000000..610e6bbf
--- /dev/null
+++ b/altosdroid/res/layout/map_type.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  Copyright © 2015 Keith Packard <keithp@keithp.com>
+
+  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.
+
+  This program is distributed in the hope that it will be useful, but
+  WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+  General Public License for more details.
+
+  You should have received a copy of the GNU General Public License along
+  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:orientation="vertical"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    >
+  <Button android:id="@+id/map_type_hybrid"
+	   android:layout_width="fill_parent"
+	   android:layout_height="wrap_content"
+	   android:text="@string/preload_hybrid"
+	   android:onClick="selectType"
+	   />
+  <Button android:id="@+id/map_type_satellite"
+	   android:layout_width="fill_parent"
+	   android:layout_height="wrap_content"
+	   android:text="@string/preload_satellite"
+	   android:onClick="selectType"
+	   />
+  <Button android:id="@+id/map_type_roadmap"
+	   android:layout_width="fill_parent"
+	   android:layout_height="wrap_content"
+	   android:text="@string/preload_roadmap"
+	   android:onClick="selectType"
+	   />
+  <Button android:id="@+id/map_type_terrain"
+	   android:layout_width="fill_parent"
+	   android:layout_height="wrap_content"
+	   android:text="@string/preload_terrain"
+	   android:onClick="selectType"
+	   />
+</LinearLayout>
diff --git a/altosdroid/res/menu/option_menu.xml b/altosdroid/res/menu/option_menu.xml
index f005e881..2109ae04 100644
--- a/altosdroid/res/menu/option_menu.xml
+++ b/altosdroid/res/menu/option_menu.xml
@@ -1,17 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2009 The Android Open Source Project
+<!-- 
+  Copyright © 2015 Keith Packard <keithp@keithp.com>
 
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
+  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.
 
-          http://www.apache.org/licenses/LICENSE-2.0
+  This program is distributed in the hope that it will be useful, but
+  WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+  General Public License for more details.
 
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
+  You should have received a copy of the GNU General Public License along
+  with this program; if not, write to the Free Software Foundation, Inc.,
+  59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
 -->
 <menu xmlns:android="http://schemas.android.com/apk/res/android">
     <item android:id="@+id/connect_scan"
@@ -32,4 +34,10 @@
     <item android:id="@+id/change_units"
 	  android:icon="@android:drawable/ic_menu_view"
 	  android:title="@string/change_units" />
+    <item android:id="@+id/preload_maps"
+	  android:icon="@android:drawable/ic_menu_mapmode"
+	  android:title="@string/preload_maps" />
+    <item android:id="@+id/map_type"
+	  android:icon="@android:drawable/ic_menu_mapmode"
+	  android:title="@string/map_type" />
 </menu>
diff --git a/altosdroid/res/values/strings.xml b/altosdroid/res/values/strings.xml
index 8a5b29b4..1af0dbb7 100644
--- a/altosdroid/res/values/strings.xml
+++ b/altosdroid/res/values/strings.xml
@@ -32,6 +32,11 @@
 	<string name="select_freq">Select radio frequency</string>
 	<string name="select_rate">Select data rate</string>
 	<string name="change_units">Change units</string>
+	<string name="preload_maps">Load Maps</string>
+	<string name="map_type">Map Type</string>
+
+	<!-- MapTypeActivity -->
+	<string name="map_type">Map Type</string>
 
 	<!-- DeviceListActivity -->
 	<string name="scanning">scanning for devices…</string>
@@ -84,4 +89,19 @@
 	<string name="pad_lon_label">Pad Lon</string>
 	<string name="pad_alt_label">Pad Alt</string>
 
+	<!-- Map preload -->
+	<string name="preload_site_label">Known Launch Sites</string>
+	<string name="preload_latitude_label">Latitude</string>
+	<string name="preload_longitude_label">Longitude</string>
+
+	<string name="preload_types">Map Types</string>
+	<string name="preload_hybrid">Hybrid</string>
+	<string name="preload_satellite">Satellite</string>
+	<string name="preload_roadmap">Roadmap</string>
+	<string name="preload_terrain">Terrain</string>
+	<string name="preload_min_zoom">Minimum Zoom</string>
+	<string name="preload_max_zoom">Maximum Zoom</string>
+	<string name="preload_tile_radius">Tile Radius</string>
+	
+	<string name="preload_load">Load Map</string>
 </resources>
diff --git a/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java b/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java
index 65618646..97373ab8 100644
--- a/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java
+++ b/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java
@@ -73,6 +73,8 @@ public class AltosDroid extends FragmentActivity implements AltosUnitsListener {
 	// Intent request codes
 	public static final int REQUEST_CONNECT_DEVICE = 1;
 	public static final int REQUEST_ENABLE_BT      = 2;
+	public static final int REQUEST_PRELOAD_MAPS   = 3;
+	public static final int REQUEST_MAP_TYPE       = 4;
 
 	public static FragmentManager	fm;
 
@@ -630,6 +632,10 @@ public class AltosDroid extends FragmentActivity implements AltosUnitsListener {
 				finish();
 			}
 			break;
+		case REQUEST_MAP_TYPE:
+			if (resultCode == Activity.RESULT_OK)
+				set_map_type(data);
+			break;
 		}
 	}
 
@@ -669,6 +675,16 @@ public class AltosDroid extends FragmentActivity implements AltosUnitsListener {
 		}
 	}
 
+	private void set_map_type(Intent data) {
+		int	mode = data.getIntExtra(MapTypeActivity.EXTRA_MAP_TYPE, -1);
+
+		AltosDebug.debug("intent set_map_type %d\n", mode);
+		if (mode != -1) {
+			for (AltosDroidTab mTab : mTabs)
+				mTab.set_map_type(mode);
+		}
+	}
+
 	@Override
 	public boolean onCreateOptionsMenu(Menu menu) {
 		MenuInflater inflater = getMenuInflater();
@@ -789,6 +805,14 @@ public class AltosDroid extends FragmentActivity implements AltosUnitsListener {
 			boolean	imperial = AltosPreferences.imperial_units();
 			AltosPreferences.set_imperial_units(!imperial);
 			return true;
+		case R.id.preload_maps:
+			serverIntent = new Intent(this, PreloadMapActivity.class);
+			startActivityForResult(serverIntent, REQUEST_PRELOAD_MAPS);
+			return true;
+		case R.id.map_type:
+			serverIntent = new Intent(this, MapTypeActivity.class);
+			startActivityForResult(serverIntent, REQUEST_MAP_TYPE);
+			return true;
 		}
 		return false;
 	}
diff --git a/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroidTab.java b/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroidTab.java
index d33ad05b..b3824aa3 100644
--- a/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroidTab.java
+++ b/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroidTab.java
@@ -37,6 +37,9 @@ public abstract class AltosDroidTab extends Fragment implements AltosUnitsListen
 
 	public abstract String tab_name();
 
+	public void set_map_type(int map_type) {
+	}
+
 	public void units_changed(boolean imperial_units) {
 		if (!isHidden() && last_state != null)
 			show(last_state, last_from_receiver, last_receiver);
diff --git a/altosdroid/src/org/altusmetrum/AltosDroid/MapTypeActivity.java b/altosdroid/src/org/altusmetrum/AltosDroid/MapTypeActivity.java
new file mode 100644
index 00000000..e43841a8
--- /dev/null
+++ b/altosdroid/src/org/altusmetrum/AltosDroid/MapTypeActivity.java
@@ -0,0 +1,84 @@
+/*
+ * Copyright © 2015 Keith Packard <keithp@keithp.com>
+ *
+ * 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.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+ */
+
+package org.altusmetrum.AltosDroid;
+
+import java.util.*;
+import org.altusmetrum.AltosDroid.R;
+
+import android.app.Activity;
+import android.bluetooth.BluetoothAdapter;
+import android.bluetooth.BluetoothDevice;
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+import android.content.IntentFilter;
+import android.os.Bundle;
+import android.view.View;
+import android.view.Window;
+import android.view.View.OnClickListener;
+import android.widget.*;
+import android.widget.AdapterView.*;
+
+import org.altusmetrum.altoslib_7.*;
+
+public class MapTypeActivity extends Activity {
+	private Button hybrid;
+	private Button satellite;
+	private Button roadmap;
+	private Button terrain;
+	private int selected_type;
+
+	public static final String EXTRA_MAP_TYPE = "map_type";
+
+	private void done(int type) {
+
+		Intent intent = new Intent();
+		intent.putExtra(EXTRA_MAP_TYPE, type);
+		setResult(Activity.RESULT_OK, intent);
+		finish();
+	}
+
+	public void selectType(View view) {
+		AltosDebug.debug("selectType %s", view.toString());
+		if (view == hybrid)
+			done(AltosMap.maptype_hybrid);
+		if (view == satellite)
+			done(AltosMap.maptype_satellite);
+		if (view == roadmap)
+			done(AltosMap.maptype_roadmap);
+		if (view == terrain)
+			done(AltosMap.maptype_terrain);
+	}
+
+	@Override
+	protected void onCreate(Bundle savedInstanceState) {
+		super.onCreate(savedInstanceState);
+
+		// Setup the window
+		requestWindowFeature(Window.FEATURE_INDETERMINATE_PROGRESS);
+		setContentView(R.layout.map_type);
+
+		hybrid = (Button) findViewById(R.id.map_type_hybrid);
+		satellite = (Button) findViewById(R.id.map_type_satellite);
+		roadmap = (Button) findViewById(R.id.map_type_roadmap);
+		terrain = (Button) findViewById(R.id.map_type_terrain);
+
+		// Set result CANCELED incase the user backs out
+		setResult(Activity.RESULT_CANCELED);
+	}
+}
diff --git a/altosdroid/src/org/altusmetrum/AltosDroid/PreloadMapActivity.java b/altosdroid/src/org/altusmetrum/AltosDroid/PreloadMapActivity.java
new file mode 100644
index 00000000..2febaf29
--- /dev/null
+++ b/altosdroid/src/org/altusmetrum/AltosDroid/PreloadMapActivity.java
@@ -0,0 +1,322 @@
+/*
+ * Copyright © 2015 Keith Packard <keithp@keithp.com>
+ *
+ * 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.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+ */
+
+package org.altusmetrum.AltosDroid;
+
+import java.util.*;
+import java.io.*;
+import java.text.*;
+
+import org.altusmetrum.AltosDroid.R;
+
+import android.app.Activity;
+import android.bluetooth.BluetoothAdapter;
+import android.bluetooth.BluetoothDevice;
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+import android.content.IntentFilter;
+import android.os.Bundle;
+import android.view.View;
+import android.view.Window;
+import android.view.View.OnClickListener;
+import android.widget.*;
+import android.widget.AdapterView.*;
+
+import org.altusmetrum.altoslib_7.*;
+
+/**
+ * This Activity appears as a dialog. It lists any paired devices and
+ * devices detected in the area after discovery. When a device is chosen
+ * by the user, the MAC address of the device is sent back to the parent
+ * Activity in the result Intent.
+ */
+public class PreloadMapActivity extends Activity implements AltosLaunchSiteListener, AltosMapInterface, AltosMapLoaderListener {
+
+	private ArrayAdapter<AltosLaunchSite> known_sites_adapter;
+
+	private CheckBox	hybrid;
+	private CheckBox	satellite;
+	private CheckBox	roadmap;
+	private CheckBox	terrain;
+
+	private Spinner		min_zoom;
+	private Spinner		max_zoom;
+	private Spinner		tile_radius;
+
+	private EditText	latitude;
+	private EditText	longitude;
+
+	private ProgressBar	progress;
+
+	/* AltosMapLoaderListener interfaces */
+	public void loader_start(final int max) {
+		AltosDebug.debug("loader_start max %d\n", max);
+		this.runOnUiThread(new Runnable() {
+				public void run() {
+					progress.setMax(max);
+					progress.setProgress(0);
+				}
+			});
+	}
+
+	public void loader_notify(final int cur, final int max, final String name) {
+		AltosDebug.debug("loader_notify cur %4d max %4d %s\n", cur, max, name);
+		this.runOnUiThread(new Runnable() {
+				public void run() {
+					progress.setProgress(cur);
+				}
+			});
+	}
+
+	public void loader_done(int max) {
+		AltosDebug.debug("loader_done max %d\n", max);
+		this.runOnUiThread(new Runnable() {
+				public void run() {
+					progress.setProgress(0);
+					finish();
+				}
+			});
+	}
+
+	/* AltosLaunchSiteListener interface */
+	public void notify_launch_sites(final List<AltosLaunchSite> sites) {
+		this.runOnUiThread(new Runnable() {
+				public void run() {
+					for (AltosLaunchSite site : sites)
+						known_sites_adapter.add(site);
+				}
+			});
+	}
+
+	AltosMap	map;
+	AltosMapLoader	loader;
+
+	class PreloadMapImage implements AltosImage {
+		public void flush() {
+		}
+
+		public PreloadMapImage(File file) {
+			AltosDebug.debug("preload file %s\n", file.toString());
+		}
+	}
+
+	public AltosMapPath new_path() {
+		return null;
+	}
+
+	public AltosMapLine new_line() {
+		return null;
+	}
+
+	public AltosImage load_image(File file) throws Exception {
+		return new PreloadMapImage(file);
+	}
+
+	public AltosMapMark new_mark(double lat, double lon, int state) {
+		return null;
+	}
+
+	class PreloadMapTile extends AltosMapTile {
+		public void paint(AltosMapTransform t) {
+		}
+
+		public PreloadMapTile(AltosMapTileListener listener, AltosLatLon upper_left, AltosLatLon center, int zoom, int maptype, int px_size) {
+			super(listener, upper_left, center, zoom, maptype, px_size, 2);
+		}
+
+	}
+
+	public AltosMapTile new_tile(AltosMapTileListener listener, AltosLatLon upper_left, AltosLatLon center, int zoom, int maptype, int px_size) {
+		return new PreloadMapTile(listener, upper_left, center, zoom, maptype, px_size);
+	}
+
+	public int width() {
+		return AltosMap.px_size;
+	}
+
+	public int height() {
+		return AltosMap.px_size;
+	}
+
+	public void repaint() {
+	}
+
+	public void repaint(AltosRectangle damage) {
+	}
+
+	public void set_zoom_label(String label) {
+		AltosDebug.debug("zoom label %s\n", label);
+	}
+
+	private double text(EditText view) throws ParseException {
+		return AltosParse.parse_double_locale(view.getEditableText().toString());
+	}
+
+	private double latitude() throws ParseException {
+		return text(latitude);
+	}
+
+	private double longitude() throws ParseException {
+		return text(longitude);
+	}
+
+	private int value(Spinner spinner) {
+		return (Integer) spinner.getSelectedItem();
+	}
+
+	private int min_z() {
+		return value(min_zoom);
+	}
+
+	private int max_z() {
+		return value(max_zoom);
+	}
+
+	private int radius() {
+		return value(tile_radius);
+	}
+
+	private int bit(CheckBox box, int value) {
+		if (box.isChecked())
+			return 1 << value;
+		return 0;
+	}
+
+	private int types() {
+		return (bit(hybrid, AltosMap.maptype_hybrid) |
+			bit(satellite, AltosMap.maptype_satellite) |
+			bit(roadmap, AltosMap.maptype_roadmap) |
+			bit(terrain, AltosMap.maptype_terrain));
+	}
+
+	private void load() {
+		try {
+			double	lat = latitude();
+			double	lon = longitude();
+			int	min = min_z();
+			int	max = max_z();
+			int	r = radius();
+			int	t = types();
+
+			AltosDebug.debug("load lat %12.6f lon %12.6f min %d max %d r %d types %x\n",
+					 lat, lon, min, max, r, t);
+			loader.load(lat, lon, min, max, r, t);
+		} catch (ParseException e) {
+		}
+	}
+
+	private void add_numbers(Spinner spinner, int min, int max, int def) {
+
+		ArrayAdapter<Integer> adapter = new ArrayAdapter<Integer>(this, android.R.layout.simple_spinner_item);
+
+		int	spinner_def = 0;
+		int	pos = 0;
+
+		for (int i = min; i <= max; i++) {
+			adapter.add(new Integer(i));
+			if (i == def)
+				spinner_def = pos;
+			pos++;
+		}
+
+		spinner.setAdapter(adapter);
+		spinner.setSelection(spinner_def);
+	}
+
+	class SiteListListener implements OnItemSelectedListener {
+		public void onItemSelected(AdapterView<?> parent, View view, int pos, long id) {
+			AltosLaunchSite	site = (AltosLaunchSite) parent.getItemAtPosition(pos);
+			AltosDebug.debug("Site selected: %s\n", site.toString());
+
+			latitude.setText(new StringBuffer(String.format("%12.6f", site.latitude)));
+			longitude.setText(new StringBuffer(String.format("%12.6f", site.longitude)));
+		}
+		public void onNothingSelected(AdapterView<?> parent) {
+		}
+
+		public SiteListListener() {
+		}
+	}
+
+	@Override
+	protected void onCreate(Bundle savedInstanceState) {
+		super.onCreate(savedInstanceState);
+
+		AltosDebug.debug("preload map onCreate");
+
+		// Setup the window
+		requestWindowFeature(Window.FEATURE_INDETERMINATE_PROGRESS);
+		setContentView(R.layout.map_preload);
+
+		// Set result CANCELED incase the user backs out
+		setResult(Activity.RESULT_CANCELED);
+
+		// Initialize the button to perform device discovery
+		Button loadButton = (Button) findViewById(R.id.preload_load);
+		loadButton.setOnClickListener(new OnClickListener() {
+			public void onClick(View v) {
+				load();
+			}
+		});
+
+		latitude = (EditText) findViewById(R.id.preload_latitude);
+		longitude = (EditText) findViewById(R.id.preload_longitude);
+
+		hybrid = (CheckBox) findViewById(R.id.preload_hybrid);
+		satellite = (CheckBox) findViewById(R.id.preload_satellite);
+		roadmap = (CheckBox) findViewById(R.id.preload_roadmap);
+		terrain = (CheckBox) findViewById(R.id.preload_terrain);
+
+		hybrid.setChecked(true);
+
+		min_zoom = (Spinner) findViewById(R.id.preload_min_zoom);
+		add_numbers(min_zoom,
+			    AltosMap.min_zoom - AltosMap.default_zoom,
+			    AltosMap.max_zoom - AltosMap.default_zoom, -2);
+		max_zoom = (Spinner) findViewById(R.id.preload_max_zoom);
+		add_numbers(max_zoom,
+			    AltosMap.min_zoom - AltosMap.default_zoom,
+			    AltosMap.max_zoom - AltosMap.default_zoom, 2);
+		tile_radius = (Spinner) findViewById(R.id.preload_tile_radius);
+		add_numbers(tile_radius, 1, 5, 3);
+
+		progress = (ProgressBar) findViewById(R.id.preload_progress);
+
+		// Initialize array adapters. One for already paired devices and
+		// one for newly discovered devices
+		Spinner known_sites_spinner = (Spinner) findViewById(R.id.preload_site_list);
+
+		known_sites_adapter = new ArrayAdapter<AltosLaunchSite>(this, android.R.layout.simple_spinner_item);
+
+		known_sites_adapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item);
+
+		known_sites_spinner.setAdapter(known_sites_adapter);
+		known_sites_spinner.setOnItemSelectedListener(new SiteListListener());
+
+		map = new AltosMap(this);
+
+		loader = new AltosMapLoader(map, this);
+
+		new AltosLaunchSites(this);
+	}
+
+	@Override
+	protected void onDestroy() {
+		super.onDestroy();
+	}
+}
diff --git a/altosdroid/src/org/altusmetrum/AltosDroid/TabMap.java b/altosdroid/src/org/altusmetrum/AltosDroid/TabMap.java
index 83c8f7f8..5376d423 100644
--- a/altosdroid/src/org/altusmetrum/AltosDroid/TabMap.java
+++ b/altosdroid/src/org/altusmetrum/AltosDroid/TabMap.java
@@ -199,6 +199,19 @@ public class TabMap extends AltosDroidTab {
 
 	}
 
+	public void set_map_type(int map_type) {
+		if (mMap != null) {
+			if (map_type == AltosMap.maptype_hybrid)
+				mMap.setMapType(GoogleMap.MAP_TYPE_HYBRID);
+			else if (map_type == AltosMap.maptype_satellite)
+				mMap.setMapType(GoogleMap.MAP_TYPE_SATELLITE);
+			else if (map_type == AltosMap.maptype_terrain)
+				mMap.setMapType(GoogleMap.MAP_TYPE_TERRAIN);
+			else
+				mMap.setMapType(GoogleMap.MAP_TYPE_NORMAL);
+		}
+	}
+
 	public TabMap() {
 	}
 }
diff --git a/altosdroid/src/org/altusmetrum/AltosDroid/TabMapOffline.java b/altosdroid/src/org/altusmetrum/AltosDroid/TabMapOffline.java
index 6742e606..31acda75 100644
--- a/altosdroid/src/org/altusmetrum/AltosDroid/TabMapOffline.java
+++ b/altosdroid/src/org/altusmetrum/AltosDroid/TabMapOffline.java
@@ -39,6 +39,7 @@ public class TabMapOffline extends AltosDroidTab implements AltosMapInterface {
 	AltosMap map;
 
 	AltosLatLon	here;
+	AltosLatLon	pad;
 
 	Canvas	canvas;
 	Paint	paint;
@@ -84,6 +85,7 @@ public class TabMapOffline extends AltosDroidTab implements AltosMapInterface {
 				canvas.drawLine((float) rocket_screen.x, (float) rocket_screen.y,
 						(float) here_screen.x, (float) here_screen.y, paint);
 			}
+			draw_bitmap(pad, pad_bitmap, pad_off_x, pad_off_y);
 			draw_bitmap(map.last_position, rocket_bitmap, rocket_off_x, rocket_off_y);
 			draw_bitmap(here, here_bitmap, here_off_x, here_off_y);
 		}
@@ -271,8 +273,6 @@ public class TabMapOffline extends AltosDroidTab implements AltosMapInterface {
 
 	class MapMark extends AltosMapMark {
 		public void paint(AltosMapTransform t) {
-			if (state == AltosLib.ao_flight_boost)
-				draw_bitmap(lat_lon, pad_bitmap, pad_off_x, pad_off_y);
 		}
 
 		MapMark(double lat, double lon, int state) {
@@ -472,6 +472,8 @@ public class TabMapOffline extends AltosDroidTab implements AltosMapInterface {
 				if (state.gps.locked && state.gps.nsat >= 4)
 					center (state.gps.lat, state.gps.lon, 10);
 			}
+			if (state.pad_lat != AltosLib.MISSING && pad == null)
+				pad = new AltosLatLon(state.pad_lat, state.pad_lon);
 		}
 
 		if (receiver != null) {
@@ -489,6 +491,11 @@ public class TabMapOffline extends AltosDroidTab implements AltosMapInterface {
 
 	}
 
+	public void set_map_type(int map_type) {
+		if (map != null)
+			map.set_maptype(map_type);
+	}
+
 	public TabMapOffline() {
 	}
 }
diff --git a/altosdroid/src/org/altusmetrum/AltosDroid/TelemetryService.java b/altosdroid/src/org/altusmetrum/AltosDroid/TelemetryService.java
index 627f5957..eae360db 100644
--- a/altosdroid/src/org/altusmetrum/AltosDroid/TelemetryService.java
+++ b/altosdroid/src/org/altusmetrum/AltosDroid/TelemetryService.java
@@ -334,7 +334,6 @@ public class TelemetryService extends Service implements LocationListener {
 
 	private void start_altos_bluetooth(DeviceAddress address, boolean pause) {
 		// Get the BLuetoothDevice object
-		AltosDebug.check_ui("start_altos_bluetooth\n");
 		BluetoothDevice device = bluetooth_adapter.getRemoteDevice(address.address);
 
 		disconnect(false);
-- 
cgit v1.2.3


From 50e709a4088f3d6846fd66cbe9b8c437b3f9c88b Mon Sep 17 00:00:00 2001
From: Keith Packard <keithp@keithp.com>
Date: Thu, 28 May 2015 22:13:39 -0700
Subject: altosdroid: Split out AltosMapView into separate file

This lets us use the regular layout configuration bits in the .xml
file instead of needing to patch the map object into the display. That
was causing problems when re-entering the map tab as the map view
would somehow end up with a zero width.

Signed-off-by: Keith Packard <keithp@keithp.com>
---
 altosdroid/res/layout/tab_map_offline.xml          | 185 +++++++++++++++++
 .../org/altusmetrum/AltosDroid/AltosMapView.java   | 163 +++++++++++++++
 .../org/altusmetrum/AltosDroid/TabMapOffline.java  | 222 ++++++++-------------
 3 files changed, 433 insertions(+), 137 deletions(-)
 create mode 100644 altosdroid/res/layout/tab_map_offline.xml
 create mode 100644 altosdroid/src/org/altusmetrum/AltosDroid/AltosMapView.java

(limited to 'altosdroid/res')

diff --git a/altosdroid/res/layout/tab_map_offline.xml b/altosdroid/res/layout/tab_map_offline.xml
new file mode 100644
index 00000000..e6f134d8
--- /dev/null
+++ b/altosdroid/res/layout/tab_map_offline.xml
@@ -0,0 +1,185 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright © 2013 Mike Beattie <mike@ethernal.org>
+
+     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.
+
+     This program is distributed in the hope that it will be useful, but
+     WITHOUT ANY WARRANTY; without even the implied warranty of
+     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+     General Public License for more details.
+
+     You should have received a copy of the GNU General Public License along
+     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="match_parent"
+	android:layout_height="match_parent"
+	android:orientation="vertical" >
+
+  <org.altusmetrum.AltosDroid.AltosMapView android:id="@+id/map_view_offline"
+					   android:layout_width="fill_parent"
+					   android:layout_height="wrap_content"
+					   android:layout_weight="1"
+					   />
+  
+  <LinearLayout
+      xmlns:android="http://schemas.android.com/apk/res/android"
+      android:layout_width="fill_parent"
+      android:layout_height="wrap_content"
+      android:baselineAligned="true"
+      android:orientation="horizontal" >
+
+    <RelativeLayout
+	android:layout_width="0dp"
+	android:layout_height="wrap_content"
+	android:layout_weight="1"
+	android:paddingTop="5dp" >
+
+      <TextView
+	  android:id="@+id/distance_label_offline"
+	  android:layout_width="wrap_content"
+	  android:layout_height="wrap_content"
+	  android:paddingRight="4dp"
+	  android:text="@string/distance_label" />
+
+      <TextView
+	  android:id="@+id/distance_value_offline"
+	  android:layout_width="wrap_content"
+	  android:layout_height="wrap_content"
+	  android:layout_toRightOf="@id/distance_label_offline"
+	  android:text=""
+	  android:textAppearance="?android:attr/textAppearanceSmall" />
+    </RelativeLayout>
+
+    <RelativeLayout
+	android:layout_width="0dp"
+	android:layout_height="wrap_content"
+	android:layout_weight="1"
+	android:paddingTop="5dp" >
+
+      <TextView
+	  android:id="@+id/bearing_label_offline"
+	  android:layout_width="wrap_content"
+	  android:layout_height="wrap_content"
+	  android:paddingRight="4dp"
+	  android:text="@string/bearing_label" />
+
+      <TextView
+	  android:id="@+id/bearing_value_offline"
+	  android:layout_width="wrap_content"
+	  android:layout_height="wrap_content"
+	  android:layout_toRightOf="@id/bearing_label_offline"
+	  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:baselineAligned="true"
+      android:orientation="horizontal" >
+
+    <RelativeLayout
+	android:layout_width="0dp"
+	android:layout_height="wrap_content"
+	android:layout_weight="1"
+	android:paddingTop="5dp" >
+
+      <TextView
+	  android:id="@+id/target_lat_label_offline"
+	  android:layout_width="wrap_content"
+	  android:layout_height="wrap_content"
+	  android:paddingRight="4dp"
+	  android:text="@string/target_latitude_label" />
+
+      <TextView
+	  android:id="@+id/target_lat_value_offline"
+	  android:layout_width="wrap_content"
+	  android:layout_height="wrap_content"
+	  android:layout_toRightOf="@id/target_lat_label_offline"
+	  android:text=""
+	  android:textAppearance="?android:attr/textAppearanceSmall" />
+    </RelativeLayout>
+
+    <RelativeLayout
+	android:layout_width="0dp"
+	android:layout_height="wrap_content"
+	android:layout_weight="1"
+	android:paddingTop="5dp" >
+
+      <TextView
+	  android:id="@+id/target_lon_label_offline"
+	  android:layout_width="wrap_content"
+	  android:layout_height="wrap_content"
+	  android:paddingRight="4dp"
+	  android:text="@string/target_longitude_label" />
+
+      <TextView
+	  android:id="@+id/target_lon_value_offline"
+	  android:layout_width="wrap_content"
+	  android:layout_height="wrap_content"
+	  android:layout_toRightOf="@id/target_lon_label_offline"
+	  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:baselineAligned="true"
+      android:orientation="horizontal" >
+
+    <RelativeLayout
+	android:layout_width="0dp"
+	android:layout_height="wrap_content"
+	android:layout_weight="1"
+	android:paddingTop="5dp" >
+
+      <TextView
+	  android:id="@+id/receiver_lat_label_offline"
+	  android:layout_width="wrap_content"
+	  android:layout_height="wrap_content"
+	  android:paddingRight="4dp"
+	  android:text="@string/receiver_latitude_label" />
+
+      <TextView
+	  android:id="@+id/receiver_lat_value_offline"
+	  android:layout_width="wrap_content"
+	  android:layout_height="wrap_content"
+	  android:layout_toRightOf="@id/receiver_lat_label_offline"
+	  android:text=""
+	  android:textAppearance="?android:attr/textAppearanceSmall" />
+    </RelativeLayout>
+
+    <RelativeLayout
+	android:layout_width="0dp"
+	android:layout_height="wrap_content"
+	android:layout_weight="1"
+	android:paddingTop="5dp" >
+
+      <TextView
+	  android:id="@+id/receiver_lon_label_offline"
+	  android:layout_width="wrap_content"
+	  android:layout_height="wrap_content"
+	  android:paddingRight="4dp"
+	  android:text="@string/receiver_longitude_label" />
+
+      <TextView
+	  android:id="@+id/receiver_lon_value_offline"
+	  android:layout_width="wrap_content"
+	  android:layout_height="wrap_content"
+	  android:layout_toRightOf="@id/receiver_lon_label_offline"
+	  android:text=""
+	  android:textAppearance="?android:attr/textAppearanceSmall" />
+    </RelativeLayout>
+  </LinearLayout>
+</LinearLayout>
diff --git a/altosdroid/src/org/altusmetrum/AltosDroid/AltosMapView.java b/altosdroid/src/org/altusmetrum/AltosDroid/AltosMapView.java
new file mode 100644
index 00000000..460a3a25
--- /dev/null
+++ b/altosdroid/src/org/altusmetrum/AltosDroid/AltosMapView.java
@@ -0,0 +1,163 @@
+/*
+ * Copyright © 2015 Keith Packard <keithp@keithp.com>
+ *
+ * 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.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+ */
+
+package org.altusmetrum.AltosDroid;
+
+import java.util.*;
+import java.io.*;
+
+import org.altusmetrum.altoslib_7.*;
+
+import android.app.Activity;
+import android.graphics.*;
+import android.os.Bundle;
+import android.support.v4.app.Fragment;
+import android.support.v4.app.FragmentTransaction;
+import android.view.*;
+import android.widget.*;
+import android.location.Location;
+import android.content.*;
+import android.util.*;
+
+public class AltosMapView extends View implements ScaleGestureDetector.OnScaleGestureListener {
+	ScaleGestureDetector	scale_detector;
+	boolean			scaling;
+	TabMapOffline		tab;
+
+	class Line {
+		AltosLatLon	a, b;
+
+		void paint() {
+			if (a != null && b != null) {
+				AltosPointDouble	a_screen = tab.map.transform.screen(a);
+				AltosPointDouble	b_screen = tab.map.transform.screen(b);
+				tab.paint.setColor(0xff8080ff);
+				tab.canvas.drawLine((float) a_screen.x, (float) a_screen.y,
+						    (float) b_screen.x, (float) b_screen.y,
+						    tab.paint);
+			}
+		}
+
+		void set_a(AltosLatLon a) {
+			this.a = a;
+		}
+
+		void set_b(AltosLatLon b) {
+			this.b = b;
+		}
+
+		Line() {
+		}
+	}
+
+	Line line = new Line();
+
+	private void draw_bitmap(AltosLatLon lat_lon, Bitmap bitmap, int off_x, int off_y) {
+		if (lat_lon != null && tab.map != null && tab.map.transform != null) {
+			AltosPointInt pt = new AltosPointInt(tab.map.transform.screen(lat_lon));
+
+			tab.canvas.drawBitmap(bitmap, pt.x - off_x, pt.y - off_y, tab.paint);
+		}
+	}
+
+	private void draw_positions() {
+		line.set_a(tab.map.last_position);
+		line.set_b(tab.here);
+		line.paint();
+		draw_bitmap(tab.pad, tab.pad_bitmap, tab.pad_off_x, tab.pad_off_y);
+		for (Rocket rocket : tab.rockets.values())
+			rocket.paint();
+		draw_bitmap(tab.here, tab.here_bitmap, tab.here_off_x, tab.here_off_y);
+	}
+
+	@Override public void invalidate() {
+		Rect r = new Rect();
+		getDrawingRect(r);
+		super.invalidate();
+	}
+
+	@Override public void invalidate(int l, int t, int r, int b) {
+		Rect rect = new Rect();
+		getDrawingRect(rect);
+		super.invalidate();
+	}
+
+	@Override
+	protected void onDraw(Canvas view_canvas) {
+		tab.canvas = view_canvas;
+		tab.paint = new Paint(Paint.ANTI_ALIAS_FLAG);
+		tab.paint.setStrokeWidth(tab.stroke_width);
+		tab.paint.setStrokeCap(Paint.Cap.ROUND);
+		tab.paint.setStrokeJoin(Paint.Join.ROUND);
+		tab.paint.setTextSize(40);
+		tab.map.paint();
+		draw_positions();
+		tab.canvas = null;
+	}
+
+	public boolean onScale(ScaleGestureDetector detector) {
+		float	f = detector.getScaleFactor();
+		if (f <= 0.8) {
+			tab.map.set_zoom(tab.map.get_zoom() - 1);
+			return true;
+		}
+		if (f >= 1.2) {
+			tab.map.set_zoom(tab.map.get_zoom() + 1);
+			return true;
+		}
+		return false;
+	}
+
+	public boolean onScaleBegin(ScaleGestureDetector detector) {
+		return true;
+	}
+
+	public void onScaleEnd(ScaleGestureDetector detector) {
+	}
+
+	@Override
+	public boolean dispatchTouchEvent(MotionEvent event) {
+		scale_detector.onTouchEvent(event);
+
+		if (scale_detector.isInProgress()) {
+			scaling = true;
+		}
+
+		if (scaling) {
+			if (event.getAction() == MotionEvent.ACTION_UP) {
+				scaling = false;
+			}
+			return true;
+		}
+
+		if (event.getAction() == MotionEvent.ACTION_DOWN) {
+			tab.map.touch_start((int) event.getX(), (int) event.getY(), true);
+		} else if (event.getAction() == MotionEvent.ACTION_MOVE) {
+			tab.map.touch_continue((int) event.getX(), (int) event.getY(), true);
+		}
+		return true;
+	}
+
+	public void set_tab(TabMapOffline tab) {
+		this.tab = tab;
+	}
+
+	public AltosMapView(Context context, AttributeSet attrs) {
+		super(context, attrs);
+		scale_detector = new ScaleGestureDetector(context, this);
+	}
+}
diff --git a/altosdroid/src/org/altusmetrum/AltosDroid/TabMapOffline.java b/altosdroid/src/org/altusmetrum/AltosDroid/TabMapOffline.java
index cbf50018..90b41156 100644
--- a/altosdroid/src/org/altusmetrum/AltosDroid/TabMapOffline.java
+++ b/altosdroid/src/org/altusmetrum/AltosDroid/TabMapOffline.java
@@ -17,7 +17,7 @@
 
 package org.altusmetrum.AltosDroid;
 
-import java.util.Arrays;
+import java.util.*;
 import java.io.*;
 
 import org.altusmetrum.altoslib_7.*;
@@ -32,6 +32,26 @@ import android.widget.*;
 import android.location.Location;
 import android.content.*;
 
+class Rocket {
+	AltosLatLon	position;
+	String		name;
+	TabMapOffline	tab;
+
+	void paint() {
+		tab.draw_bitmap(position, tab.rocket_bitmap, tab.rocket_off_x, tab.rocket_off_y);
+		tab.draw_text(position, name, 0, 3*tab.rocket_bitmap.getHeight()/4);
+	}
+
+	void set_position(AltosLatLon position) {
+		this.position = position;
+	}
+
+	Rocket(String name, TabMapOffline tab) {
+		this.name = name;
+		this.tab = tab;
+	}
+}
+
 public class TabMapOffline extends AltosDroidTab implements AltosMapInterface {
 
 	AltosDroid mAltosDroid;
@@ -59,117 +79,41 @@ public class TabMapOffline extends AltosDroidTab implements AltosMapInterface {
 	private TextView mTargetLongitudeView;
 	private TextView mReceiverLatitudeView;
 	private TextView mReceiverLongitudeView;
+	private AltosMapView map_view;
 
 	private double mapAccuracy = -1;
 
 	int	stroke_width = 20;
 
-	private void draw_bitmap(AltosLatLon lat_lon, Bitmap bitmap, int off_x, int off_y) {
-		if (lat_lon != null) {
-			AltosPointInt pt = new AltosPointInt(map.transform.screen(lat_lon));
-
-			canvas.drawBitmap(bitmap, pt.x - off_x, pt.y - off_y, paint);
-		}
-	}
-
-	class MapView extends View implements ScaleGestureDetector.OnScaleGestureListener {
-
-		ScaleGestureDetector	scale_detector;
-		boolean			scaling;
 
-		private void draw_positions() {
-			if (map.last_position != null && here != null) {
-				AltosPointDouble	rocket_screen = map.transform.screen(map.last_position);
-				AltosPointDouble	here_screen = map.transform.screen(here);
-				paint.setColor(0xff8080ff);
-				canvas.drawLine((float) rocket_screen.x, (float) rocket_screen.y,
-						(float) here_screen.x, (float) here_screen.y, paint);
-			}
-			draw_bitmap(pad, pad_bitmap, pad_off_x, pad_off_y);
-			draw_bitmap(map.last_position, rocket_bitmap, rocket_off_x, rocket_off_y);
-			draw_bitmap(here, here_bitmap, here_off_x, here_off_y);
-		}
-
-		protected void onDraw(Canvas view_canvas) {
-			canvas = view_canvas;
-			paint = new Paint(Paint.ANTI_ALIAS_FLAG);
-			paint.setStrokeWidth(stroke_width);
-			paint.setStrokeCap(Paint.Cap.ROUND);
-			paint.setStrokeJoin(Paint.Join.ROUND);
-			map.paint();
-			draw_positions();
-			canvas = null;
-		}
-
-		public boolean onScale(ScaleGestureDetector detector) {
-			float	f = detector.getScaleFactor();
-			AltosDebug.debug("onScale %f\n", f);
-			if (f <= 0.8) {
-				map.set_zoom(map.get_zoom() - 1);
-				return true;
-			}
-			if (f >= 1.2) {
-				map.set_zoom(map.get_zoom() + 1);
-				return true;
-			}
-			return false;
-		}
-
-		public boolean onScaleBegin(ScaleGestureDetector detector) {
-			AltosDebug.debug("onScaleBegin %f\n", detector.getScaleFactor());
-			return true;
-		}
-
-		public void onScaleEnd(ScaleGestureDetector detector) {
-			AltosDebug.debug("onScaleEnd %f\n", detector.getScaleFactor());
-		}
-
-		@Override
-		public boolean dispatchTouchEvent(MotionEvent event) {
-			scale_detector.onTouchEvent(event);
-
-			if (scale_detector.isInProgress()) {
-				scaling = true;
-			}
+	void draw_text(AltosLatLon lat_lon, String text, int off_x, int off_y) {
+		if (lat_lon != null && map != null && map.transform != null) {
+			AltosPointInt pt = new AltosPointInt(map.transform.screen(lat_lon));
 
-			if (scaling) {
-				if(AltosDebug.D) AltosDebug.debug("scale in progress\n");
-				if (event.getAction() == MotionEvent.ACTION_UP) {
-					AltosDebug.debug("scale finished\n");
-					scaling = false;
-				}
-				return true;
-			}
+			Rect	bounds = new Rect();
+			paint.getTextBounds(text, 0, text.length(), bounds);
 
-			if (event.getAction() == MotionEvent.ACTION_DOWN) {
-				AltosDebug.debug("down event %g %g\n", event.getX(), event.getY());
-				map.touch_start((int) event.getX(), (int) event.getY(), true);
-			} else if (event.getAction() == MotionEvent.ACTION_MOVE) {
-				AltosDebug.debug("continue event %g %g\n", event.getX(), event.getY());
-				map.touch_continue((int) event.getX(), (int) event.getY(), true);
-			}
-			return true;
-		}
+			int	width = bounds.right - bounds.left;
+			int	height = bounds.bottom - bounds.top;
 
-		public MapView(Context context) {
-			super(context);
-			scale_detector = new ScaleGestureDetector(this.getContext(), this);
+			float x = pt.x;
+			float y = pt.y;
+			x = x - width / 2.0f - off_x;
+			y = y + height / 2.0f - off_y;
+			paint.setColor(0xff000000);
+			canvas.drawText(text, 0, text.length(), x, y, paint);
 		}
 	}
 
-	class MapFragment extends Fragment {
-		MapView	map_view;
-
-		public View onCreateView(LayoutInflater inflator, ViewGroup container, Bundle savedInstanceState) {
-			map_view = new MapView(container.getContext());
-			return map_view;
-		}
+	void draw_bitmap(AltosLatLon lat_lon, Bitmap bitmap, int off_x, int off_y) {
+		if (lat_lon != null && map != null && map.transform != null) {
+			AltosPointInt pt = new AltosPointInt(map.transform.screen(lat_lon));
 
-		public MapFragment() {
+			canvas.drawBitmap(bitmap, pt.x - off_x, pt.y - off_y, paint);
 		}
 	}
 
-	MapFragment map_fragment;
+	HashMap<Integer,Rocket> rockets = new HashMap<Integer,Rocket>();
 
 	/* AltosMapInterface */
 
@@ -337,7 +281,6 @@ public class TabMapOffline extends AltosDroidTab implements AltosMapInterface {
 					}
 				}
 			}
-
 		}
 
 		public MapTile(AltosMapTileListener listener, AltosLatLon upper_left, AltosLatLon center, int zoom, int maptype, int px_size) {
@@ -351,39 +294,34 @@ public class TabMapOffline extends AltosDroidTab implements AltosMapInterface {
 	}
 
 	public int width() {
-		if (map_fragment != null && map_fragment.map_view != null)
-			return map_fragment.map_view.getWidth();
+		if (map_view != null)
+			return map_view.getWidth();
 		return 500;
 	}
 
 	public int height() {
-		if (map_fragment != null && map_fragment.map_view != null)
-			return map_fragment.map_view.getHeight();
+		if (map_view != null)
+			return map_view.getHeight();
 		return 500;
 	}
 
 	public void repaint() {
-		this.getActivity().runOnUiThread(new Runnable() {
-				public void run() {
-					if (map_fragment != null && map_fragment.map_view != null)
-						map_fragment.map_view.invalidate();
-				}
-			});
+		if (map_view != null)
+			map_view.postInvalidate();
 	}
 
-	public void repaint(AltosRectangle t_damage) {
-		final AltosRectangle damage = t_damage;
-		this.getActivity().runOnUiThread(new Runnable() {
-				public void run() {
-					if (map_fragment != null && map_fragment.map_view != null)
-						map_fragment.map_view.invalidate(damage.x, damage.y, damage.x + damage.width, damage.y + damage.height);
-				}
-			});
+	public void repaint(AltosRectangle damage) {
+		if (map_view != null)
+			map_view.postInvalidate(damage.x, damage.y, damage.x + damage.width, damage.y + damage.height);
 	}
 
 	public void set_zoom_label(String label) {
 	}
 
+	public void debug(String format, Object ... arguments) {
+		AltosDebug.debug(format, arguments);
+	}
+
 	@Override
 	public void onAttach(Activity activity) {
 		super.onAttach(activity);
@@ -409,6 +347,11 @@ public class TabMapOffline extends AltosDroidTab implements AltosMapInterface {
 		here_off_y = here_bitmap.getHeight() / 2;
 	}
 
+	@Override
+	public void onDetach() {
+		mAltosDroid = null;
+	}
+
 	@Override
 	public void onCreate(Bundle savedInstanceState) {
 		super.onCreate(savedInstanceState);
@@ -416,40 +359,29 @@ public class TabMapOffline extends AltosDroidTab implements AltosMapInterface {
 
 	@Override
 	public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
-		View v = inflater.inflate(R.layout.tab_map, container, false);
-
-		map_fragment = new MapFragment();
-		map = new AltosMap(this);
-		mDistanceView  = (TextView)v.findViewById(R.id.distance_value);
-		mBearingView   = (TextView)v.findViewById(R.id.bearing_value);
-		mTargetLatitudeView  = (TextView)v.findViewById(R.id.target_lat_value);
-		mTargetLongitudeView = (TextView)v.findViewById(R.id.target_lon_value);
-		mReceiverLatitudeView  = (TextView)v.findViewById(R.id.receiver_lat_value);
-		mReceiverLongitudeView = (TextView)v.findViewById(R.id.receiver_lon_value);
+		View v = inflater.inflate(R.layout.tab_map_offline, container, false);
+
+		map_view = (AltosMapView)v.findViewById(R.id.map_view_offline);
+		map_view.set_tab(this);
+		mDistanceView  = (TextView)v.findViewById(R.id.distance_value_offline);
+		mBearingView   = (TextView)v.findViewById(R.id.bearing_value_offline);
+		mTargetLatitudeView  = (TextView)v.findViewById(R.id.target_lat_value_offline);
+		mTargetLongitudeView = (TextView)v.findViewById(R.id.target_lon_value_offline);
+		mReceiverLatitudeView  = (TextView)v.findViewById(R.id.receiver_lat_value_offline);
+		mReceiverLongitudeView = (TextView)v.findViewById(R.id.receiver_lon_value_offline);
 		return v;
 	}
 
 	@Override
 	public void onActivityCreated(Bundle savedInstanceState) {
 		super.onActivityCreated(savedInstanceState);
-		getChildFragmentManager().beginTransaction().add(R.id.map, map_fragment).commit();
 	}
- 
+
 	@Override
 	public void onDestroyView() {
 		super.onDestroyView();
 
 		mAltosDroid.unregisterTab(this);
-		mAltosDroid = null;
-		map_fragment = null;
-
-//		Fragment fragment = (getFragmentManager().findFragmentById(R.id.map));
-//		FragmentTransaction ft = getActivity().getSupportFragmentManager().beginTransaction();
-//		ft.remove(fragment);
-//		ft.commit();
-	}
-
-	private void setupMap() {
 	}
 
 	private void center(double lat, double lon, double accuracy) {
@@ -478,6 +410,21 @@ public class TabMapOffline extends AltosDroidTab implements AltosMapInterface {
 			}
 			if (state.pad_lat != AltosLib.MISSING && pad == null)
 				pad = new AltosLatLon(state.pad_lat, state.pad_lon);
+
+			int serial = state.serial;
+			if (serial == AltosLib.MISSING)
+				serial = 0;
+
+			Rocket	rocket = null;
+
+			if (state.gps != null && state.gps.locked) {
+				if (!rockets.containsKey(serial)) {
+					rocket = new Rocket(String.format("%d", serial), this);
+					rockets.put(serial, rocket);
+				} else
+					rocket = rockets.get(serial);
+				rocket.set_position(new AltosLatLon(state.gps.lat, state.gps.lon));
+			}
 		}
 
 		if (receiver != null) {
@@ -495,6 +442,7 @@ public class TabMapOffline extends AltosDroidTab implements AltosMapInterface {
 
 	}
 
+	@Override
 	public void set_map_type(int map_type) {
 		if (map != null)
 			map.set_maptype(map_type);
-- 
cgit v1.2.3


From a533ea525620f194fd89fedad043659bb433d71b Mon Sep 17 00:00:00 2001
From: Keith Packard <keithp@keithp.com>
Date: Sun, 31 May 2015 23:09:18 -0700
Subject: altosdroid: Switch from custom title to standard Holo theme

This gives us the menu button, which is awfully useful on devices
without a hardware version...

Signed-off-by: Keith Packard <keithp@keithp.com>
---
 altosdroid/res/menu/option_menu.xml                  |  6 +++---
 altosdroid/res/values/CustomTheme.xml                |  3 +--
 .../src/org/altusmetrum/AltosDroid/AltosDroid.java   | 20 +++++---------------
 3 files changed, 9 insertions(+), 20 deletions(-)

(limited to 'altosdroid/res')

diff --git a/altosdroid/res/menu/option_menu.xml b/altosdroid/res/menu/option_menu.xml
index 2109ae04..1b3142a8 100644
--- a/altosdroid/res/menu/option_menu.xml
+++ b/altosdroid/res/menu/option_menu.xml
@@ -22,9 +22,6 @@
     <item android:id="@+id/disconnect"
 	  android:icon="@android:drawable/ic_notification_clear_all"
 	  android:title="@string/disconnect_device" />
-    <item android:id="@+id/quit"
-          android:icon="@android:drawable/ic_menu_close_clear_cancel"
-          android:title="@string/quit" />
     <item android:id="@+id/select_freq"
           android:icon="@android:drawable/ic_menu_preferences"
           android:title="@string/select_freq" />
@@ -40,4 +37,7 @@
     <item android:id="@+id/map_type"
 	  android:icon="@android:drawable/ic_menu_mapmode"
 	  android:title="@string/map_type" />
+    <item android:id="@+id/quit"
+          android:icon="@android:drawable/ic_menu_close_clear_cancel"
+          android:title="@string/quit" />
 </menu>
diff --git a/altosdroid/res/values/CustomTheme.xml b/altosdroid/res/values/CustomTheme.xml
index 4daed1f8..6c701ea2 100644
--- a/altosdroid/res/values/CustomTheme.xml
+++ b/altosdroid/res/values/CustomTheme.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <resources>
-  <style name="CustomTheme" parent="android:Theme">
-    <item name="android:windowNoTitle">false</item>
+  <style name="CustomTheme" parent="android:Theme.Holo">
   </style>
 </resources>
diff --git a/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java b/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java
index 5be9ba84..293dff7f 100644
--- a/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java
+++ b/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java
@@ -82,9 +82,6 @@ public class AltosDroid extends FragmentActivity implements AltosUnitsListener {
 
 	private BluetoothAdapter mBluetoothAdapter = null;
 
-	// Layout Views
-	private TextView mTitle;
-
 	// Flight state values
 	private TextView mCallsignView;
 	private TextView mRSSIView;
@@ -221,20 +218,20 @@ public class AltosDroid extends FragmentActivity implements AltosUnitsListener {
 				if (telemetry_state.telemetry_rate != AltosLib.ao_telemetry_rate_38400)
 					str = str.concat(String.format(" %d bps",
 								       AltosLib.ao_telemetry_rate_values[telemetry_state.telemetry_rate]));
-				mTitle.setText(str);
+				setTitle(str);
 			} else {
-				mTitle.setText(R.string.title_connected_to);
+				setTitle(R.string.title_connected_to);
 			}
 			break;
 		case TelemetryState.CONNECT_CONNECTING:
 			if (telemetry_state.address != null)
-				mTitle.setText(String.format("Connecting to %s...", telemetry_state.address.name));
+				setTitle(String.format("Connecting to %s...", telemetry_state.address.name));
 			else
-				mTitle.setText("Connecting to something...");
+				setTitle("Connecting to something...");
 			break;
 		case TelemetryState.CONNECT_DISCONNECTED:
 		case TelemetryState.CONNECT_NONE:
-			mTitle.setText(R.string.title_not_connected);
+			setTitle(R.string.title_not_connected);
 			break;
 		}
 	}
@@ -427,9 +424,7 @@ public class AltosDroid extends FragmentActivity implements AltosUnitsListener {
 		fm = getSupportFragmentManager();
 
 		// Set up the window layout
-		requestWindowFeature(Window.FEATURE_CUSTOM_TITLE);
 		setContentView(R.layout.altosdroid);
-		getWindow().setFeatureInt(Window.FEATURE_CUSTOM_TITLE, R.layout.custom_title);
 
 		// Create the Tabs and ViewPager
 		mTabHost = (TabHost)findViewById(android.R.id.tabhost);
@@ -447,11 +442,6 @@ public class AltosDroid extends FragmentActivity implements AltosUnitsListener {
 		mTabsAdapter.addTab(mTabHost.newTabSpec("map").setIndicator(create_tab_view("Map")), TabMap.class, null);
 		mTabsAdapter.addTab(mTabHost.newTabSpec("offmap").setIndicator(create_tab_view("OffMap")), TabMapOffline.class, null);
 
-		// Set up the custom title
-		mTitle = (TextView) findViewById(R.id.title_left_text);
-		mTitle.setText(R.string.app_name);
-		mTitle = (TextView) findViewById(R.id.title_right_text);
-
 		// Display the Version
 		mVersion = (TextView) findViewById(R.id.version);
 		mVersion.setText("Version: " + BuildInfo.version +
-- 
cgit v1.2.3


From 6cb7d76c3fbe32b442713e358654d07b2506897e Mon Sep 17 00:00:00 2001
From: Keith Packard <keithp@keithp.com>
Date: Sat, 6 Jun 2015 20:37:53 -0700
Subject: altosdroid: Resource changes needed for multi-tracker mode

Signed-off-by: Keith Packard <keithp@keithp.com>
---
 altosdroid/res/menu/option_menu.xml |  6 ++++++
 altosdroid/res/values/Colors.xml    | 20 ++++++++++++++++++++
 altosdroid/res/values/strings.xml   |  2 ++
 3 files changed, 28 insertions(+)
 create mode 100644 altosdroid/res/values/Colors.xml

(limited to 'altosdroid/res')

diff --git a/altosdroid/res/menu/option_menu.xml b/altosdroid/res/menu/option_menu.xml
index 1b3142a8..9cb57dfc 100644
--- a/altosdroid/res/menu/option_menu.xml
+++ b/altosdroid/res/menu/option_menu.xml
@@ -37,6 +37,12 @@
     <item android:id="@+id/map_type"
 	  android:icon="@android:drawable/ic_menu_mapmode"
 	  android:title="@string/map_type" />
+    <item android:id="@+id/select_tracker"
+	  android:icon="@android:drawable/ic_menu_view"
+	  android:title="@string/select_tracker"/>
+    <item android:id="@+id/delete_track"
+	  android:icon="@android:drawable/ic_notification_clear_all"
+	  android:title="@string/delete_track"/>
     <item android:id="@+id/quit"
           android:icon="@android:drawable/ic_menu_close_clear_cancel"
           android:title="@string/quit" />
diff --git a/altosdroid/res/values/Colors.xml b/altosdroid/res/values/Colors.xml
new file mode 100644
index 00000000..055c6df2
--- /dev/null
+++ b/altosdroid/res/values/Colors.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+	 Copyright © 2015 Keith Packard <keithp@keithp.com>
+
+	 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.
+
+	 This program is distributed in the hope that it will be useful, but
+	 WITHOUT ANY WARRANTY; without even the implied warranty of
+	 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+	 General Public License for more details.
+
+	 You should have received a copy of the GNU General Public License along
+	 with this program; if not, write to the Free Software Foundation, Inc.,
+	 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+-->
+<resources>
+  <color name="old_color">#ffff4040</color>
+</resources>
diff --git a/altosdroid/res/values/strings.xml b/altosdroid/res/values/strings.xml
index 1af0dbb7..79a77ba9 100644
--- a/altosdroid/res/values/strings.xml
+++ b/altosdroid/res/values/strings.xml
@@ -33,6 +33,8 @@
 	<string name="select_rate">Select data rate</string>
 	<string name="change_units">Change units</string>
 	<string name="preload_maps">Load Maps</string>
+	<string name="select_tracker">Select Tracker</string>
+	<string name="delete_track">Delete Track</string>
 	<string name="map_type">Map Type</string>
 
 	<!-- MapTypeActivity -->
-- 
cgit v1.2.3


From 9af72a2e629779833ff1787bbfc2ddc8b9d88bba Mon Sep 17 00:00:00 2001
From: Keith Packard <keithp@keithp.com>
Date: Sun, 21 Jun 2015 09:37:05 -0700
Subject: altosdroid: Show receiver battery voltage in the 'pad' view

Helpful to determine when the receiver battery is getting low

Signed-off-by: Keith Packard <keithp@keithp.com>
---
 altosdroid/Notebook                                |   6 +-
 altosdroid/res/layout/tab_pad.xml                  |  39 +++++-
 altosdroid/res/values/strings.xml                  |   1 +
 .../src/org/altusmetrum/AltosDroid/TabPad.java     | 154 ++++++++++++---------
 .../altusmetrum/AltosDroid/TelemetryService.java   |  34 ++++-
 .../org/altusmetrum/AltosDroid/TelemetryState.java |   2 +
 6 files changed, 168 insertions(+), 68 deletions(-)

(limited to 'altosdroid/res')

diff --git a/altosdroid/Notebook b/altosdroid/Notebook
index 38a4bc01..c0ba2098 100644
--- a/altosdroid/Notebook
+++ b/altosdroid/Notebook
@@ -15,8 +15,6 @@ Desired AltosDroid feature list
 
  *) Monitor-idle mode
 
- *) TeleBT battery voltage
-
  *) Select tracker by clicking map
 
  *) Auto select tracker after long delay
@@ -94,3 +92,7 @@ Completed features
  *) Provide units for age field, turn red if old
 
 	Done
+
+ *) TeleBT battery voltage
+
+	Done
diff --git a/altosdroid/res/layout/tab_pad.xml b/altosdroid/res/layout/tab_pad.xml
index 38e61f83..380eab91 100644
--- a/altosdroid/res/layout/tab_pad.xml
+++ b/altosdroid/res/layout/tab_pad.xml
@@ -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"
@@ -317,4 +354,4 @@
 			android:textAppearance="?android:attr/textAppearanceSmall" />
 	</RelativeLayout>
 
-</LinearLayout>
\ No newline at end of file
+</LinearLayout>
diff --git a/altosdroid/res/values/strings.xml b/altosdroid/res/values/strings.xml
index 79a77ba9..0c012819 100644
--- a/altosdroid/res/values/strings.xml
+++ b/altosdroid/res/values/strings.xml
@@ -76,6 +76,7 @@
 	<string name="max_speed_label">Max Speed</string>
 	<string name="max_accel_label">Max Accel</string>
 	<string name="battery_voltage_label">Battery Voltage</string>
+	<string name="receiver_voltage_label">Receiver Battery</string>
 	<string name="apogee_voltage_label">Apogee Igniter Voltage</string>
 	<string name="main_voltage_label">Main Igniter Voltage</string>
 	<string name="logging_label">On-board Data Logging</string>
diff --git a/altosdroid/src/org/altusmetrum/AltosDroid/TabPad.java b/altosdroid/src/org/altusmetrum/AltosDroid/TabPad.java
index 7a256963..92bb9013 100644
--- a/altosdroid/src/org/altusmetrum/AltosDroid/TabPad.java
+++ b/altosdroid/src/org/altusmetrum/AltosDroid/TabPad.java
@@ -30,64 +30,78 @@ import android.widget.TextView;
 import android.location.Location;
 
 public class TabPad extends AltosDroidTab {
-	private TextView mBatteryVoltageView;
-	private TextView mBatteryVoltageLabel;
-	private GoNoGoLights mBatteryLights;
-	private TextView mApogeeVoltageView;
-	private TextView mApogeeVoltageLabel;
-	private GoNoGoLights mApogeeLights;
-	private TextView mMainVoltageView;
-	private TextView mMainVoltageLabel;
-	private GoNoGoLights mMainLights;
-	private TextView mDataLoggingView;
-	private GoNoGoLights mDataLoggingLights;
-	private TextView mGPSLockedView;
-	private GoNoGoLights mGPSLockedLights;
-	private TextView mGPSReadyView;
-	private GoNoGoLights mGPSReadyLights;
-	private TextView mPadLatitudeView;
-	private TextView mPadLongitudeView;
-	private TextView mPadAltitudeView;
+	private TextView battery_voltage_view;
+	private GoNoGoLights battery_lights;
+
+	private TextView receiver_voltage_view;
+	private TextView receiver_voltage_label;
+	private GoNoGoLights receiver_voltage_lights;
+
+	private TextView apogee_voltage_view;
+	private TextView apogee_voltage_label;
+	private GoNoGoLights apogee_lights;
+
+	private TextView main_voltage_view;
+	private TextView main_voltage_label;
+	private GoNoGoLights main_lights;
+
+	private TextView data_logging_view;
+	private GoNoGoLights data_logging_lights;
+
+	private TextView gps_locked_view;
+	private GoNoGoLights gps_locked_lights;
+
+	private TextView gps_ready_view;
+	private GoNoGoLights gps_ready_lights;
+
+	private TextView pad_latitude_view;
+	private TextView pad_longitude_view;
+	private TextView pad_altitude_view;
 
 	@Override
 	public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
 		View v = inflater.inflate(R.layout.tab_pad, container, false);
-		mBatteryVoltageView = (TextView) v.findViewById(R.id.battery_voltage_value);
-		mBatteryVoltageLabel = (TextView) v.findViewById(R.id.battery_voltage_label);
-		mBatteryLights = new GoNoGoLights((ImageView) v.findViewById(R.id.battery_redled),
+		battery_voltage_view = (TextView) v.findViewById(R.id.battery_voltage_value);
+		battery_lights = new GoNoGoLights((ImageView) v.findViewById(R.id.battery_redled),
 		                                  (ImageView) v.findViewById(R.id.battery_greenled),
 		                                  getResources());
 
-		mApogeeVoltageView = (TextView) v.findViewById(R.id.apogee_voltage_value);
-		mApogeeVoltageLabel = (TextView) v.findViewById(R.id.apogee_voltage_label);
-		mApogeeLights = new GoNoGoLights((ImageView) v.findViewById(R.id.apogee_redled),
+		receiver_voltage_view = (TextView) v.findViewById(R.id.receiver_voltage_value);
+		receiver_voltage_label = (TextView) v.findViewById(R.id.receiver_voltage_label);
+		receiver_voltage_lights = new GoNoGoLights((ImageView) v.findViewById(R.id.receiver_redled),
+							   (ImageView) v.findViewById(R.id.receiver_greenled),
+							   getResources());
+
+		apogee_voltage_view = (TextView) v.findViewById(R.id.apogee_voltage_value);
+		apogee_voltage_label = (TextView) v.findViewById(R.id.apogee_voltage_label);
+		apogee_lights = new GoNoGoLights((ImageView) v.findViewById(R.id.apogee_redled),
 		                                 (ImageView) v.findViewById(R.id.apogee_greenled),
 		                                 getResources());
 
-		mMainVoltageView = (TextView) v.findViewById(R.id.main_voltage_value);
-		mMainVoltageLabel = (TextView) v.findViewById(R.id.main_voltage_label);
-		mMainLights = new GoNoGoLights((ImageView) v.findViewById(R.id.main_redled),
+		main_voltage_view = (TextView) v.findViewById(R.id.main_voltage_value);
+		main_voltage_label = (TextView) v.findViewById(R.id.main_voltage_label);
+		main_lights = new GoNoGoLights((ImageView) v.findViewById(R.id.main_redled),
 		                               (ImageView) v.findViewById(R.id.main_greenled),
 		                               getResources());
 
-		mDataLoggingView = (TextView) v.findViewById(R.id.logging_value);
-		mDataLoggingLights = new GoNoGoLights((ImageView) v.findViewById(R.id.logging_redled),
+		data_logging_view = (TextView) v.findViewById(R.id.logging_value);
+		data_logging_lights = new GoNoGoLights((ImageView) v.findViewById(R.id.logging_redled),
 		                                      (ImageView) v.findViewById(R.id.logging_greenled),
 		                                      getResources());
 
-		mGPSLockedView = (TextView) v.findViewById(R.id.gps_locked_value);
-		mGPSLockedLights = new GoNoGoLights((ImageView) v.findViewById(R.id.gps_locked_redled),
+		gps_locked_view = (TextView) v.findViewById(R.id.gps_locked_value);
+		gps_locked_lights = new GoNoGoLights((ImageView) v.findViewById(R.id.gps_locked_redled),
 		                                    (ImageView) v.findViewById(R.id.gps_locked_greenled),
 		                                    getResources());
 
-		mGPSReadyView = (TextView) v.findViewById(R.id.gps_ready_value);
-		mGPSReadyLights = new GoNoGoLights((ImageView) v.findViewById(R.id.gps_ready_redled),
+		gps_ready_view = (TextView) v.findViewById(R.id.gps_ready_value);
+		gps_ready_lights = new GoNoGoLights((ImageView) v.findViewById(R.id.gps_ready_redled),
 		                                   (ImageView) v.findViewById(R.id.gps_ready_greenled),
 		                                   getResources());
 
-		mPadLatitudeView = (TextView) v.findViewById(R.id.pad_lat_value);
-		mPadLongitudeView = (TextView) v.findViewById(R.id.pad_lon_value);
-		mPadAltitudeView = (TextView) v.findViewById(R.id.pad_alt_value);
+		pad_latitude_view = (TextView) v.findViewById(R.id.pad_lat_value);
+		pad_longitude_view = (TextView) v.findViewById(R.id.pad_lon_value);
+		pad_altitude_view = (TextView) v.findViewById(R.id.pad_alt_value);
         return v;
 	}
 
@@ -95,60 +109,72 @@ public class TabPad extends AltosDroidTab {
 
 	public void show(TelemetryState telem_state, AltosState state, AltosGreatCircle from_receiver, Location receiver) {
 		if (state != null) {
-			mBatteryVoltageView.setText(AltosDroid.number("%4.2f V", state.battery_voltage));
-			mBatteryLights.set(state.battery_voltage >= AltosLib.ao_battery_good, state.battery_voltage == AltosLib.MISSING);
+			battery_voltage_view.setText(AltosDroid.number("%4.2f V", state.battery_voltage));
+			battery_lights.set(state.battery_voltage >= AltosLib.ao_battery_good, state.battery_voltage == AltosLib.MISSING);
 			if (state.apogee_voltage == AltosLib.MISSING) {
-				mApogeeVoltageView.setVisibility(View.GONE);
-				mApogeeVoltageLabel.setVisibility(View.GONE);
+				apogee_voltage_view.setVisibility(View.GONE);
+				apogee_voltage_label.setVisibility(View.GONE);
 			} else {
-				mApogeeVoltageView.setText(AltosDroid.number("%4.2f V", state.apogee_voltage));
-				mApogeeVoltageView.setVisibility(View.VISIBLE);
-				mApogeeVoltageLabel.setVisibility(View.VISIBLE);
+				apogee_voltage_view.setText(AltosDroid.number("%4.2f V", state.apogee_voltage));
+				apogee_voltage_view.setVisibility(View.VISIBLE);
+				apogee_voltage_label.setVisibility(View.VISIBLE);
 			}
-			mApogeeLights.set(state.apogee_voltage >= AltosLib.ao_igniter_good, state.apogee_voltage == AltosLib.MISSING);
+			apogee_lights.set(state.apogee_voltage >= AltosLib.ao_igniter_good, state.apogee_voltage == AltosLib.MISSING);
 			if (state.main_voltage == AltosLib.MISSING) {
-				mMainVoltageView.setVisibility(View.GONE);
-				mMainVoltageLabel.setVisibility(View.GONE);
+				main_voltage_view.setVisibility(View.GONE);
+				main_voltage_label.setVisibility(View.GONE);
 			} else {
-				mMainVoltageView.setText(AltosDroid.number("%4.2f V", state.main_voltage));
-				mMainVoltageView.setVisibility(View.VISIBLE);
-				mMainVoltageLabel.setVisibility(View.VISIBLE);
+				main_voltage_view.setText(AltosDroid.number("%4.2f V", state.main_voltage));
+				main_voltage_view.setVisibility(View.VISIBLE);
+				main_voltage_label.setVisibility(View.VISIBLE);
 			}
-			mMainLights.set(state.main_voltage >= AltosLib.ao_igniter_good, state.main_voltage == AltosLib.MISSING);
+			main_lights.set(state.main_voltage >= AltosLib.ao_igniter_good, state.main_voltage == AltosLib.MISSING);
 
 			if (state.flight != 0) {
 				if (state.state <= AltosLib.ao_flight_pad)
-					mDataLoggingView.setText("Ready to record");
+					data_logging_view.setText("Ready to record");
 				else if (state.state < AltosLib.ao_flight_landed)
-					mDataLoggingView.setText("Recording data");
+					data_logging_view.setText("Recording data");
 				else
-					mDataLoggingView.setText("Recorded data");
+					data_logging_view.setText("Recorded data");
 			} else {
-				mDataLoggingView.setText("Storage full");
+				data_logging_view.setText("Storage full");
 			}
-			mDataLoggingLights.set(state.flight != 0, state.flight == AltosLib.MISSING);
+			data_logging_lights.set(state.flight != 0, state.flight == AltosLib.MISSING);
 
 			if (state.gps != null) {
 				int soln = state.gps.nsat;
 				int nsat = state.gps.cc_gps_sat != null ? state.gps.cc_gps_sat.length : 0;
-				mGPSLockedView.setText(String.format("%4d in soln, %4d in view", soln, nsat));
-				mGPSLockedLights.set(state.gps.locked && state.gps.nsat >= 4, false);
+				gps_locked_view.setText(String.format("%4d in soln, %4d in view", soln, nsat));
+				gps_locked_lights.set(state.gps.locked && state.gps.nsat >= 4, false);
 				if (state.gps_ready)
-					mGPSReadyView.setText("Ready");
+					gps_ready_view.setText("Ready");
 				else
-					mGPSReadyView.setText(AltosDroid.integer("Waiting %d", state.gps_waiting));
+					gps_ready_view.setText(AltosDroid.integer("Waiting %d", state.gps_waiting));
 			} else
-				mGPSLockedLights.set(false, true);
-			mGPSReadyLights.set(state.gps_ready, state.gps == null);
+				gps_locked_lights.set(false, true);
+			gps_ready_lights.set(state.gps_ready, state.gps == null);
+		}
+
+		if (telem_state != null) {
+			if (telem_state.receiver_battery == AltosLib.MISSING) {
+				receiver_voltage_view.setVisibility(View.GONE);
+				receiver_voltage_label.setVisibility(View.GONE);
+			} else {
+				receiver_voltage_view.setText(AltosDroid.number("%4.2f V", telem_state.receiver_battery));
+				receiver_voltage_view.setVisibility(View.VISIBLE);
+				receiver_voltage_label.setVisibility(View.VISIBLE);
+			}
+			receiver_voltage_lights.set(telem_state.receiver_battery >= AltosLib.ao_battery_good, telem_state.receiver_battery == AltosLib.MISSING);
 		}
 
 		if (receiver != null) {
 			double altitude = AltosLib.MISSING;
 			if (receiver.hasAltitude())
 				altitude = receiver.getAltitude();
-			mPadLatitudeView.setText(AltosDroid.pos(receiver.getLatitude(), "N", "S"));
-			mPadLongitudeView.setText(AltosDroid.pos(receiver.getLongitude(), "E", "W"));
-			set_value(mPadAltitudeView, AltosConvert.height, 6, altitude);
+			pad_latitude_view.setText(AltosDroid.pos(receiver.getLatitude(), "N", "S"));
+			pad_longitude_view.setText(AltosDroid.pos(receiver.getLongitude(), "E", "W"));
+			set_value(pad_altitude_view, AltosConvert.height, 6, altitude);
 		}
 	}
 
diff --git a/altosdroid/src/org/altusmetrum/AltosDroid/TelemetryService.java b/altosdroid/src/org/altusmetrum/AltosDroid/TelemetryService.java
index 80694ea7..52363430 100644
--- a/altosdroid/src/org/altusmetrum/AltosDroid/TelemetryService.java
+++ b/altosdroid/src/org/altusmetrum/AltosDroid/TelemetryService.java
@@ -45,7 +45,6 @@ import android.location.Criteria;
 
 import org.altusmetrum.altoslib_7.*;
 
-
 public class TelemetryService extends Service implements LocationListener {
 
 	static final int MSG_REGISTER_CLIENT   = 1;
@@ -305,6 +304,8 @@ public class TelemetryService extends Service implements LocationListener {
 		if (altos_link != null)
 			altos_link.closing();
 
+		stop_receiver_voltage_timer();
+
 		if (telemetry_reader != null) {
 			AltosDebug.debug("disconnect(): stopping TelemetryReader");
 			telemetry_reader.interrupt();
@@ -367,6 +368,35 @@ public class TelemetryService extends Service implements LocationListener {
 		send_to_clients();
 	}
 
+	// Timer for receiver battery voltage monitoring
+	Timer receiver_voltage_timer;
+
+	private void update_receiver_voltage() {
+		if (altos_link != null) {
+			try {
+				double	voltage = altos_link.monitor_battery();
+				AltosDebug.debug("update receiver voltage %g\n", voltage);
+				telemetry_state.receiver_battery = voltage;
+			} catch (InterruptedException ie) {
+			}
+		}
+	}
+
+	private void stop_receiver_voltage_timer() {
+		if (receiver_voltage_timer != null) {
+			receiver_voltage_timer.cancel();
+			receiver_voltage_timer.purge();
+			receiver_voltage_timer = null;
+		}
+	}
+
+	private void start_receiver_voltage_timer() {
+		if (receiver_voltage_timer == null && altos_link.has_monitor_battery()) {
+			receiver_voltage_timer = new Timer();
+			receiver_voltage_timer.scheduleAtFixedRate(new TimerTask() { public void run() {update_receiver_voltage();}}, 1000L, 10000L);
+		}
+	}
+
 	private void connected() throws InterruptedException {
 		AltosDebug.debug("connected top");
 		AltosDebug.check_ui("connected\n");
@@ -401,6 +431,8 @@ public class TelemetryService extends Service implements LocationListener {
 
 		telemetry_logger = new TelemetryLogger(this, altos_link);
 
+		start_receiver_voltage_timer();
+
 		AltosDebug.debug("Notify UI of connection");
 
 		send_to_clients();
diff --git a/altosdroid/src/org/altusmetrum/AltosDroid/TelemetryState.java b/altosdroid/src/org/altusmetrum/AltosDroid/TelemetryState.java
index d023128f..c40df648 100644
--- a/altosdroid/src/org/altusmetrum/AltosDroid/TelemetryState.java
+++ b/altosdroid/src/org/altusmetrum/AltosDroid/TelemetryState.java
@@ -32,6 +32,7 @@ public class TelemetryState {
 	AltosConfigData	config;
 	Location	location;
 	int		crc_errors;
+	double		receiver_battery;
 	double		frequency;
 	int		telemetry_rate;
 
@@ -45,6 +46,7 @@ public class TelemetryState {
 		states = new HashMap<Integer,AltosState>();
 		location = null;
 		crc_errors = 0;
+		receiver_battery = AltosLib.MISSING;
 		frequency = AltosPreferences.frequency(0);
 		telemetry_rate = AltosPreferences.telemetry_rate(0);
 	}
-- 
cgit v1.2.3


From ee656c9d41238ab2c56859a03fe6b8ce8ff2df4e Mon Sep 17 00:00:00 2001
From: Keith Packard <keithp@keithp.com>
Date: Sun, 21 Jun 2015 10:34:00 -0700
Subject: altosdroid: Add map source preference

Not hooked up yet.

Signed-off-by: Keith Packard <keithp@keithp.com>
---
 altosdroid/res/menu/option_menu.xml                |  3 +++
 altosdroid/res/values/strings.xml                  |  1 +
 .../src/org/altusmetrum/AltosDroid/AltosDroid.java | 12 +++++++++++
 .../AltosDroid/AltosDroidPreferences.java          | 24 ++++++++++++++++++++++
 .../altusmetrum/AltosDroid/TelemetryService.java   |  3 ---
 5 files changed, 40 insertions(+), 3 deletions(-)

(limited to 'altosdroid/res')

diff --git a/altosdroid/res/menu/option_menu.xml b/altosdroid/res/menu/option_menu.xml
index 9cb57dfc..7e08c803 100644
--- a/altosdroid/res/menu/option_menu.xml
+++ b/altosdroid/res/menu/option_menu.xml
@@ -37,6 +37,9 @@
     <item android:id="@+id/map_type"
 	  android:icon="@android:drawable/ic_menu_mapmode"
 	  android:title="@string/map_type" />
+    <item android:id="@+id/map_source"
+	  android:icon="@android:drawable/ic_menu_mapmode"
+	  android:title="@string/map_source" />
     <item android:id="@+id/select_tracker"
 	  android:icon="@android:drawable/ic_menu_view"
 	  android:title="@string/select_tracker"/>
diff --git a/altosdroid/res/values/strings.xml b/altosdroid/res/values/strings.xml
index 0c012819..5a9d9629 100644
--- a/altosdroid/res/values/strings.xml
+++ b/altosdroid/res/values/strings.xml
@@ -36,6 +36,7 @@
 	<string name="select_tracker">Select Tracker</string>
 	<string name="delete_track">Delete Track</string>
 	<string name="map_type">Map Type</string>
+	<string name="map_source">Toggle Online/Offline maps</string>
 
 	<!-- MapTypeActivity -->
 	<string name="map_type">Map Type</string>
diff --git a/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java b/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java
index 8fe97187..fb669c5d 100644
--- a/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java
+++ b/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java
@@ -503,12 +503,18 @@ public class AltosDroid extends FragmentActivity implements AltosUnitsListener {
 		return tab_view;
 	}
 
+	public void set_map_source() {
+	}
+
 	@Override
 	public void onCreate(Bundle savedInstanceState) {
 		super.onCreate(savedInstanceState);
 		AltosDebug.init(this);
 		AltosDebug.debug("+++ ON CREATE +++");
 
+		// Initialise preferences
+		AltosDroidPreferences.init(this);
+
 		fm = getSupportFragmentManager();
 
 		// Set up the window layout
@@ -918,6 +924,12 @@ public class AltosDroid extends FragmentActivity implements AltosUnitsListener {
 			serverIntent = new Intent(this, MapTypeActivity.class);
 			startActivityForResult(serverIntent, REQUEST_MAP_TYPE);
 			return true;
+		case R.id.map_source:
+			int source = AltosDroidPreferences.map_source();
+			int new_source = source == AltosDroidPreferences.MAP_SOURCE_ONLINE ? AltosDroidPreferences.MAP_SOURCE_OFFLINE : AltosDroidPreferences.MAP_SOURCE_ONLINE;
+			AltosDroidPreferences.set_map_source(new_source);
+			set_map_source();
+			return true;
 		case R.id.select_tracker:
 			if (serials != null) {
 				String[] trackers = new String[serials.length];
diff --git a/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroidPreferences.java b/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroidPreferences.java
index cda35f1d..6f74014a 100644
--- a/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroidPreferences.java
+++ b/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroidPreferences.java
@@ -27,6 +27,14 @@ public class AltosDroidPreferences extends AltosPreferences {
 
 	static DeviceAddress	active_device_address;
 
+	/* Map source preference name */
+	final static String mapSourcePreference = "MAP-SOURCE";
+
+	static final int	MAP_SOURCE_OFFLINE = 0;
+	static final int	MAP_SOURCE_ONLINE = 1;
+
+	static int	map_source;
+
 	public static void init(Context context) {
 		if (backend != null)
 			return;
@@ -38,6 +46,8 @@ public class AltosDroidPreferences extends AltosPreferences {
 
 		if (address != null && name != null)
 			active_device_address = new DeviceAddress (address, name);
+
+		map_source = backend.getInt(mapSourcePreference, MAP_SOURCE_ONLINE);
 	}
 
 	public static void set_active_device(DeviceAddress address) {
@@ -54,4 +64,18 @@ public class AltosDroidPreferences extends AltosPreferences {
 			return active_device_address;
 		}
 	}
+
+	public static void set_map_source(int map_source) {
+		synchronized(backend) {
+			AltosDroidPreferences.map_source = map_source;
+			backend.putInt(mapSourcePreference, map_source);
+			flush_preferences();
+		}
+	}
+
+	public static int map_source() {
+		synchronized(backend) {
+			return map_source;
+		}
+	}
 }
diff --git a/altosdroid/src/org/altusmetrum/AltosDroid/TelemetryService.java b/altosdroid/src/org/altusmetrum/AltosDroid/TelemetryService.java
index 52363430..2d0ae65d 100644
--- a/altosdroid/src/org/altusmetrum/AltosDroid/TelemetryService.java
+++ b/altosdroid/src/org/altusmetrum/AltosDroid/TelemetryService.java
@@ -449,9 +449,6 @@ public class TelemetryService extends Service implements LocationListener {
 			Toast.makeText(this, "Bluetooth is not available", Toast.LENGTH_LONG).show();
 		}
 
-		// Initialise preferences
-		AltosDroidPreferences.init(this);
-
 		telemetry_state = new TelemetryState();
 
 		// Create a reference to the NotificationManager so that we can update our notifcation text later
-- 
cgit v1.2.3


From 18fe64cf2648568dd0bde5acd7b627f1ddb6917e Mon Sep 17 00:00:00 2001
From: Keith Packard <keithp@keithp.com>
Date: Mon, 22 Jun 2015 18:26:34 -0700
Subject: altosdroid: Display online/offline maps in same tab

Make the map portion switchable between online and offline maps,
leaving the rest of the tab alone.

Signed-off-by: Keith Packard <keithp@keithp.com>
---
 altosdroid/res/layout/tab_map.xml                  |  13 +-
 altosdroid/res/layout/tab_map_offline.xml          |  24 +-
 .../src/org/altusmetrum/AltosDroid/AltosDroid.java |   6 +-
 .../AltosDroid/AltosDroidMapInterface.java         |  33 ++
 .../org/altusmetrum/AltosDroid/AltosDroidTab.java  |   3 +
 .../altusmetrum/AltosDroid/AltosMapOffline.java    | 469 +++++++++++++++++++++
 .../org/altusmetrum/AltosDroid/AltosMapOnline.java | 283 +++++++++++++
 .../org/altusmetrum/AltosDroid/AltosMapView.java   | 168 --------
 .../src/org/altusmetrum/AltosDroid/TabMap.java     |   1 -
 .../org/altusmetrum/AltosDroid/TabMapOffline.java  | 381 +++--------------
 10 files changed, 884 insertions(+), 497 deletions(-)
 create mode 100644 altosdroid/src/org/altusmetrum/AltosDroid/AltosDroidMapInterface.java
 create mode 100644 altosdroid/src/org/altusmetrum/AltosDroid/AltosMapOffline.java
 create mode 100644 altosdroid/src/org/altusmetrum/AltosDroid/AltosMapOnline.java
 delete mode 100644 altosdroid/src/org/altusmetrum/AltosDroid/AltosMapView.java

(limited to 'altosdroid/res')

diff --git a/altosdroid/res/layout/tab_map.xml b/altosdroid/res/layout/tab_map.xml
index f611ae48..b4c97f91 100644
--- a/altosdroid/res/layout/tab_map.xml
+++ b/altosdroid/res/layout/tab_map.xml
@@ -20,13 +20,12 @@
 	android:layout_height="match_parent"
 	android:orientation="vertical" >
 
-	<LinearLayout
+  	<LinearLayout
 	    android:id="@+id/map"
-		android:orientation="horizontal"
-		android:layout_width="fill_parent"
-		android:layout_height="0dp"
-		android:layout_weight="1">
-
+	    android:orientation="horizontal"
+	    android:layout_width="fill_parent"
+	    android:layout_height="fill_parent"
+	    android:layout_weight="1">
 	</LinearLayout>
 
 	<LinearLayout
@@ -185,4 +184,4 @@
 				android:textAppearance="?android:attr/textAppearanceSmall" />
 		</RelativeLayout>
 	</LinearLayout>
-</LinearLayout>
\ No newline at end of file
+</LinearLayout>
diff --git a/altosdroid/res/layout/tab_map_offline.xml b/altosdroid/res/layout/tab_map_offline.xml
index e6f134d8..1b0f28a7 100644
--- a/altosdroid/res/layout/tab_map_offline.xml
+++ b/altosdroid/res/layout/tab_map_offline.xml
@@ -20,11 +20,25 @@
 	android:layout_height="match_parent"
 	android:orientation="vertical" >
 
-  <org.altusmetrum.AltosDroid.AltosMapView android:id="@+id/map_view_offline"
-					   android:layout_width="fill_parent"
-					   android:layout_height="wrap_content"
-					   android:layout_weight="1"
-					   />
+  <FrameLayout
+      android:layout_width="fill_parent"
+      android:layout_height="wrap_content"
+      android:baselineAligned="true"
+      android:orientation="horizontal"
+      android:layout_weight="1">
+    <LinearLayout
+	android:id="@+id/map_online"
+	android:orientation="horizontal"
+	android:layout_width="fill_parent"
+	android:layout_height="fill_parent"
+	android:layout_weight="1">
+    </LinearLayout>
+    <org.altusmetrum.AltosDroid.AltosMapOffline android:id="@+id/map_view_offline"
+						android:layout_width="fill_parent"
+						android:layout_height="wrap_content"
+						android:layout_weight="1"
+						/>
+  </FrameLayout>
   
   <LinearLayout
       xmlns:android="http://schemas.android.com/apk/res/android"
diff --git a/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java b/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java
index fb669c5d..426e2e84 100644
--- a/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java
+++ b/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java
@@ -503,7 +503,9 @@ public class AltosDroid extends FragmentActivity implements AltosUnitsListener {
 		return tab_view;
 	}
 
-	public void set_map_source() {
+	public void set_map_source(int source) {
+		for (AltosDroidTab mTab : mTabs)
+			mTab.set_map_source(source);
 	}
 
 	@Override
@@ -928,7 +930,7 @@ public class AltosDroid extends FragmentActivity implements AltosUnitsListener {
 			int source = AltosDroidPreferences.map_source();
 			int new_source = source == AltosDroidPreferences.MAP_SOURCE_ONLINE ? AltosDroidPreferences.MAP_SOURCE_OFFLINE : AltosDroidPreferences.MAP_SOURCE_ONLINE;
 			AltosDroidPreferences.set_map_source(new_source);
-			set_map_source();
+			set_map_source(new_source);
 			return true;
 		case R.id.select_tracker:
 			if (serials != null) {
diff --git a/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroidMapInterface.java b/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroidMapInterface.java
new file mode 100644
index 00000000..681cd311
--- /dev/null
+++ b/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroidMapInterface.java
@@ -0,0 +1,33 @@
+/*
+ * Copyright © 2015 Keith Packard <keithp@keithp.com>
+ *
+ * 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.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+ */
+
+package org.altusmetrum.AltosDroid;
+
+import java.util.*;
+import java.io.*;
+import android.location.Location;
+import org.altusmetrum.altoslib_7.*;
+
+public interface AltosDroidMapInterface {
+	public void onCreateView(int map_type);
+
+	public void set_visible(boolean visible);
+
+	public void center(double lat, double lon, double accuracy);
+
+	public void show(TelemetryState telem_state, AltosState state, AltosGreatCircle from_receiver, Location receiver);
+}
diff --git a/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroidTab.java b/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroidTab.java
index 6a71021c..f75035d4 100644
--- a/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroidTab.java
+++ b/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroidTab.java
@@ -42,6 +42,9 @@ public abstract class AltosDroidTab extends Fragment implements AltosUnitsListen
 	public void set_map_type(int map_type) {
 	}
 
+	public void set_map_source(int map_source) {
+	}
+
 	public void units_changed(boolean imperial_units) {
 		if (!isHidden())
 			show(last_telem_state, last_state, last_from_receiver, last_receiver);
diff --git a/altosdroid/src/org/altusmetrum/AltosDroid/AltosMapOffline.java b/altosdroid/src/org/altusmetrum/AltosDroid/AltosMapOffline.java
new file mode 100644
index 00000000..3ff6ff25
--- /dev/null
+++ b/altosdroid/src/org/altusmetrum/AltosDroid/AltosMapOffline.java
@@ -0,0 +1,469 @@
+/*
+ * Copyright © 2015 Keith Packard <keithp@keithp.com>
+ *
+ * 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.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+ */
+
+package org.altusmetrum.AltosDroid;
+
+import java.util.*;
+import java.io.*;
+
+import org.altusmetrum.altoslib_7.*;
+
+import android.app.Activity;
+import android.graphics.*;
+import android.os.Bundle;
+import android.support.v4.app.Fragment;
+import android.support.v4.app.FragmentTransaction;
+import android.view.*;
+import android.widget.*;
+import android.location.Location;
+import android.content.*;
+import android.util.*;
+
+class Rocket implements Comparable {
+	AltosLatLon	position;
+	String		name;
+	long		last_packet;
+	AltosMapOffline	map_offline;
+
+	void paint() {
+		map_offline.draw_bitmap(position, map_offline.rocket_bitmap, map_offline.rocket_off_x, map_offline.rocket_off_y);
+		map_offline.draw_text(position, name, 0, 3*map_offline.rocket_bitmap.getHeight()/4);
+	}
+
+	void set_position(AltosLatLon position, long last_packet) {
+		this.position = position;
+		this.last_packet = last_packet;
+	}
+
+	Rocket(String name, AltosMapOffline map_offline) {
+		this.name = name;
+		this.map_offline = map_offline;
+	}
+
+	public int compareTo(Object o) {
+		Rocket other = (Rocket) o;
+
+		long	diff = last_packet - other.last_packet;
+
+		if (diff > 0)
+			return 1;
+		if (diff < 0)
+			return -1;
+		return 0;
+	}
+}
+
+public class AltosMapOffline extends View implements ScaleGestureDetector.OnScaleGestureListener, AltosMapInterface, AltosDroidMapInterface {
+	ScaleGestureDetector	scale_detector;
+	boolean			scaling;
+	AltosMap		map;
+
+	AltosLatLon	here;
+	AltosLatLon	pad;
+
+	Canvas	canvas;
+	Paint	paint;
+
+	Bitmap	pad_bitmap;
+	int	pad_off_x, pad_off_y;
+	Bitmap	rocket_bitmap;
+	int	rocket_off_x, rocket_off_y;
+	Bitmap	here_bitmap;
+	int	here_off_x, here_off_y;
+
+	static  final int	WHITE = 0xffffffff;
+	static  final int	RED   = 0xffff0000;
+	static  final int	PINK  = 0xffff8080;
+	static  final int	YELLOW= 0xffffff00;
+	static  final int	CYAN  = 0xff00ffff;
+	static  final int	BLUE  = 0xff0000ff;
+	static  final int	BLACK = 0xff000000;
+
+	public static final int stateColors[] = {
+		WHITE,  // startup
+		WHITE,  // idle
+		WHITE,  // pad
+		RED,    // boost
+		PINK,   // fast
+		YELLOW, // coast
+		CYAN,   // drogue
+		BLUE,   // main
+		BLACK,  // landed
+		BLACK,  // invalid
+		CYAN,   // stateless
+	};
+
+	/* AltosMapInterface */
+	public void debug(String format, Object ... arguments) {
+		AltosDebug.debug(format, arguments);
+	}
+
+	class MapTile extends AltosMapTile {
+		public void paint(AltosMapTransform t) {
+			AltosPointInt		pt = new AltosPointInt(t.screen(upper_left));
+
+			if (canvas.quickReject(pt.x, pt.y, pt.x + px_size, pt.y + px_size, Canvas.EdgeType.AA))
+				return;
+
+			AltosImage		altos_image = cache.get(this, store, px_size, px_size);
+
+			MapImage 		map_image = (MapImage) altos_image;
+
+			Bitmap			bitmap = null;
+
+			if (map_image != null)
+				bitmap = map_image.bitmap;
+
+			if (bitmap != null) {
+				canvas.drawBitmap(bitmap, pt.x, pt.y, paint);
+			} else {
+				paint.setColor(0xff808080);
+				canvas.drawRect(pt.x, pt.y, pt.x + px_size, pt.y + px_size, paint);
+				if (t.has_location()) {
+					String	message = null;
+					switch (status) {
+					case AltosMapTile.loading:
+						message = "Loading...";
+						break;
+					case AltosMapTile.bad_request:
+						message = "Internal error";
+						break;
+					case AltosMapTile.failed:
+						message = "Network error, check connection";
+						break;
+					case AltosMapTile.forbidden:
+						message = "Too many requests, try later";
+						break;
+					}
+					if (message != null) {
+						Rect	bounds = new Rect();
+						paint.getTextBounds(message, 0, message.length(), bounds);
+
+						int	width = bounds.right - bounds.left;
+						int	height = bounds.bottom - bounds.top;
+
+						float x = pt.x + px_size / 2.0f;
+						float y = pt.y + px_size / 2.0f;
+						x = x - width / 2.0f;
+						y = y + height / 2.0f;
+						paint.setColor(0xff000000);
+						canvas.drawText(message, 0, message.length(), x, y, paint);
+					}
+				}
+			}
+		}
+
+		public MapTile(AltosMapTileListener listener, AltosLatLon upper_left, AltosLatLon center, int zoom, int maptype, int px_size) {
+			super(listener, upper_left, center, zoom, maptype, px_size, 2);
+		}
+
+	}
+
+	public AltosMapTile new_tile(AltosMapTileListener listener, AltosLatLon upper_left, AltosLatLon center, int zoom, int maptype, int px_size) {
+		return new MapTile(listener, upper_left, center, zoom, maptype, px_size);
+	}
+
+	public AltosMapPath new_path() {
+		return null;
+	}
+
+	public AltosMapLine new_line() {
+		return null;
+	}
+
+	class MapImage implements AltosImage {
+		public Bitmap	bitmap;
+
+		public void flush() {
+			if (bitmap != null) {
+				bitmap.recycle();
+				bitmap = null;
+			}
+		}
+
+		public MapImage(File file) {
+			bitmap = BitmapFactory.decodeFile(file.getPath());
+		}
+	}
+
+	public AltosImage load_image(File file) throws Exception {
+		return new MapImage(file);
+	}
+
+	class MapMark extends AltosMapMark {
+		public void paint(AltosMapTransform t) {
+		}
+
+		MapMark(double lat, double lon, int state) {
+			super(lat, lon, state);
+		}
+	}
+
+	public AltosMapMark new_mark(double lat, double lon, int state) {
+		return new MapMark(lat, lon, state);
+	}
+
+	public int width() {
+		return getWidth();
+	}
+
+	public int height() {
+		return getHeight();
+	}
+
+	public void repaint() {
+		postInvalidate();
+	}
+
+	public void repaint(AltosRectangle damage) {
+		postInvalidate(damage.x, damage.y, damage.x + damage.width, damage.y + damage.height);
+	}
+
+	public void set_zoom_label(String label) {
+	}
+
+	class Line {
+		AltosLatLon	a, b;
+
+		void paint() {
+			if (a != null && b != null) {
+				AltosPointDouble	a_screen = map.transform.screen(a);
+				AltosPointDouble	b_screen = map.transform.screen(b);
+				paint.setColor(0xff8080ff);
+				canvas.drawLine((float) a_screen.x, (float) a_screen.y,
+						    (float) b_screen.x, (float) b_screen.y,
+						    paint);
+			}
+		}
+
+		void set_a(AltosLatLon a) {
+			this.a = a;
+		}
+
+		void set_b(AltosLatLon b) {
+			this.b = b;
+		}
+
+		Line() {
+		}
+	}
+
+	Line line = new Line();
+
+	int	stroke_width = 20;
+
+	void draw_text(AltosLatLon lat_lon, String text, int off_x, int off_y) {
+		if (lat_lon != null && map != null && map.transform != null) {
+			AltosPointInt pt = new AltosPointInt(map.transform.screen(lat_lon));
+
+			Rect	bounds = new Rect();
+			paint.getTextBounds(text, 0, text.length(), bounds);
+
+			int	width = bounds.right - bounds.left;
+			int	height = bounds.bottom - bounds.top;
+
+			float x = pt.x;
+			float y = pt.y;
+			x = x - width / 2.0f - off_x;
+			y = y + height / 2.0f - off_y;
+			paint.setColor(0xff000000);
+			canvas.drawText(text, 0, text.length(), x, y, paint);
+		}
+	}
+
+	HashMap<Integer,Rocket> rockets = new HashMap<Integer,Rocket>();
+
+	void draw_bitmap(AltosLatLon lat_lon, Bitmap bitmap, int off_x, int off_y) {
+		if (lat_lon != null && map != null && map.transform != null) {
+			AltosPointInt pt = new AltosPointInt(map.transform.screen(lat_lon));
+
+			canvas.drawBitmap(bitmap, pt.x - off_x, pt.y - off_y, paint);
+		}
+	}
+
+	private void draw_positions() {
+		line.set_a(map.last_position);
+		line.set_b(here);
+		line.paint();
+		draw_bitmap(pad, pad_bitmap, pad_off_x, pad_off_y);
+
+		Rocket[]	rocket_array = rockets.values().toArray(new Rocket[0]);
+
+		Arrays.sort(rocket_array);
+		for (Rocket rocket : rocket_array)
+			rocket.paint();
+		draw_bitmap(here, here_bitmap, here_off_x, here_off_y);
+	}
+
+	@Override public void invalidate() {
+		Rect r = new Rect();
+		getDrawingRect(r);
+		super.invalidate();
+	}
+
+	@Override public void invalidate(int l, int t, int r, int b) {
+		Rect rect = new Rect();
+		getDrawingRect(rect);
+		super.invalidate();
+	}
+
+	@Override
+	protected void onDraw(Canvas view_canvas) {
+		debug("onDraw");
+		if (map == null) {
+			debug("MapView draw without map\n");
+			return;
+		}
+		canvas = view_canvas;
+		paint = new Paint(Paint.ANTI_ALIAS_FLAG);
+		paint.setStrokeWidth(stroke_width);
+		paint.setStrokeCap(Paint.Cap.ROUND);
+		paint.setStrokeJoin(Paint.Join.ROUND);
+		paint.setTextSize(40);
+		map.paint();
+		draw_positions();
+		canvas = null;
+	}
+
+	public boolean onScale(ScaleGestureDetector detector) {
+		float	f = detector.getScaleFactor();
+
+		if (f <= 0.8) {
+			map.set_zoom_centre(map.get_zoom() - 1, new AltosPointInt((int) detector.getFocusX(), (int) detector.getFocusY()));
+			return true;
+		}
+		if (f >= 1.2) {
+			map.set_zoom_centre(map.get_zoom() + 1, new AltosPointInt((int) detector.getFocusX(), (int) detector.getFocusY()));
+			return true;
+		}
+		return false;
+	}
+
+	public boolean onScaleBegin(ScaleGestureDetector detector) {
+		return true;
+	}
+
+	public void onScaleEnd(ScaleGestureDetector detector) {
+	}
+
+	@Override
+	public boolean dispatchTouchEvent(MotionEvent event) {
+		scale_detector.onTouchEvent(event);
+
+		if (scale_detector.isInProgress()) {
+			scaling = true;
+		}
+
+		if (scaling) {
+			if (event.getAction() == MotionEvent.ACTION_UP) {
+				scaling = false;
+			}
+			return true;
+		}
+
+		if (event.getAction() == MotionEvent.ACTION_DOWN) {
+			map.touch_start((int) event.getX(), (int) event.getY(), true);
+		} else if (event.getAction() == MotionEvent.ACTION_MOVE) {
+			map.touch_continue((int) event.getX(), (int) event.getY(), true);
+		}
+		return true;
+	}
+
+	double	mapAccuracy;
+
+	public void center(double lat, double lon, double accuracy) {
+		if (mapAccuracy < 0 || accuracy < mapAccuracy/10) {
+			if (map != null)
+				map.maybe_centre(lat, lon);
+			mapAccuracy = accuracy;
+		}
+	}
+
+	public void set_visible(boolean visible) {
+		if (visible)
+			setVisibility(VISIBLE);
+		else
+			setVisibility(GONE);
+	}
+
+	public void show(TelemetryState telem_state, AltosState state, AltosGreatCircle from_receiver, Location receiver) {
+		if (state != null) {
+			map.show(state, null);
+			if (state.pad_lat != AltosLib.MISSING && pad == null)
+				pad = new AltosLatLon(state.pad_lat, state.pad_lon);
+		}
+
+		if (telem_state != null) {
+			Integer[] old_serial = rockets.keySet().toArray(new Integer[0]);
+			Integer[] new_serial = telem_state.states.keySet().toArray(new Integer[0]);
+
+			/* remove deleted keys */
+			for (int serial : old_serial) {
+				if (!telem_state.states.containsKey(serial))
+					rockets.remove(serial);
+			}
+
+			/* set remaining keys */
+
+			for (int serial : new_serial) {
+				Rocket 		rocket;
+				AltosState	t_state = telem_state.states.get(serial);
+				if (rockets.containsKey(serial))
+					rocket = rockets.get(serial);
+				else {
+					rocket = new Rocket(String.format("%d", serial), this);
+					rockets.put(serial, rocket);
+				}
+				if (t_state.gps != null)
+					rocket.set_position(new AltosLatLon(t_state.gps.lat, t_state.gps.lon), t_state.received_time);
+			}
+		}
+		if (receiver != null) {
+			here = new AltosLatLon(receiver.getLatitude(), receiver.getLongitude());
+		}
+	}
+
+	public void onCreateView(int map_type) {
+		map = new AltosMap(this);
+		map.set_maptype(map_type);
+
+		pad_bitmap = BitmapFactory.decodeResource(getResources(), R.drawable.pad);
+		/* arrow at the bottom of the launchpad image */
+		pad_off_x = pad_bitmap.getWidth() / 2;
+		pad_off_y = pad_bitmap.getHeight();
+
+		rocket_bitmap = BitmapFactory.decodeResource(getResources(), R.drawable.rocket);
+		/* arrow at the bottom of the rocket image */
+		rocket_off_x = rocket_bitmap.getWidth() / 2;
+		rocket_off_y = rocket_bitmap.getHeight();
+
+		here_bitmap = BitmapFactory.decodeResource(getResources(), R.drawable.ic_maps_indicator_current_position);
+		/* Center of the dot */
+		here_off_x = here_bitmap.getWidth() / 2;
+		here_off_y = here_bitmap.getHeight() / 2;
+	}
+
+	public void set_map_type(int map_type) {
+		if (map != null)
+			map.set_maptype(map_type);
+	}
+
+	public AltosMapOffline(Context context, AttributeSet attrs) {
+		super(context, attrs);
+		scale_detector = new ScaleGestureDetector(context, this);
+	}
+}
diff --git a/altosdroid/src/org/altusmetrum/AltosDroid/AltosMapOnline.java b/altosdroid/src/org/altusmetrum/AltosDroid/AltosMapOnline.java
new file mode 100644
index 00000000..9503a0bd
--- /dev/null
+++ b/altosdroid/src/org/altusmetrum/AltosDroid/AltosMapOnline.java
@@ -0,0 +1,283 @@
+/*
+ * Copyright © 2013 Mike Beattie <mike@ethernal.org>
+ *
+ * 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.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+ */
+
+package org.altusmetrum.AltosDroid;
+
+import java.util.*;
+
+import org.altusmetrum.altoslib_7.*;
+
+import com.google.android.gms.maps.CameraUpdateFactory;
+import com.google.android.gms.maps.GoogleMap;
+import com.google.android.gms.maps.SupportMapFragment;
+import com.google.android.gms.maps.model.BitmapDescriptorFactory;
+import com.google.android.gms.maps.model.LatLng;
+import com.google.android.gms.maps.model.Marker;
+import com.google.android.gms.maps.model.MarkerOptions;
+import com.google.android.gms.maps.model.Polyline;
+import com.google.android.gms.maps.model.PolylineOptions;
+
+import android.app.Activity;
+import android.graphics.Color;
+import android.graphics.*;
+import android.os.Bundle;
+import android.support.v4.app.Fragment;
+//import android.support.v4.app.FragmentTransaction;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.TextView;
+import android.location.Location;
+import android.content.*;
+
+class RocketOnline implements Comparable {
+	Marker		marker;
+	long		last_packet;
+
+	void set_position(AltosLatLon position, long last_packet) {
+		marker.setPosition(new LatLng(position.lat, position.lon));
+		this.last_packet = last_packet;
+	}
+
+	private Bitmap rocket_bitmap(Context context, String text) {
+
+		/* From: http://mapicons.nicolasmollet.com/markers/industry/military/missile-2/
+		 */
+		Bitmap orig_bitmap = BitmapFactory.decodeResource(context.getResources(), R.drawable.rocket);
+		Bitmap bitmap = orig_bitmap.copy(Bitmap.Config.ARGB_8888, true);
+
+		Canvas canvas = new Canvas(bitmap);
+		Paint paint = new Paint();
+		paint.setTextSize(40);
+		paint.setColor(0xff000000);
+
+		Rect	bounds = new Rect();
+		paint.getTextBounds(text, 0, text.length(), bounds);
+
+		int	width = bounds.right - bounds.left;
+		int	height = bounds.bottom - bounds.top;
+
+		float x = bitmap.getWidth() / 2.0f - width / 2.0f;
+		float y = bitmap.getHeight() / 2.0f - height / 2.0f;
+
+		canvas.drawText(text, 0, text.length(), x, y, paint);
+		return bitmap;
+	}
+
+	public void remove() {
+		marker.remove();
+	}
+
+	public int compareTo(Object o) {
+		RocketOnline other = (RocketOnline) o;
+
+		long	diff = last_packet - other.last_packet;
+
+		if (diff > 0)
+			return 1;
+		if (diff < 0)
+			return -1;
+		return 0;
+	}
+
+	RocketOnline(Context context, String name, GoogleMap map, double lat, double lon, long last_packet) {
+		this.marker = map.addMarker(new MarkerOptions()
+					    .icon(BitmapDescriptorFactory.fromBitmap(rocket_bitmap(context, name)))
+					    .position(new LatLng(lat, lon))
+					    .visible(true));
+		this.last_packet = last_packet;
+	}
+}
+
+public class AltosMapOnline implements AltosDroidMapInterface {
+	public SupportMapFragment mMapFragment;
+	private GoogleMap mMap;
+	private boolean mapLoaded = false;
+	Context context;
+
+	private HashMap<Integer,RocketOnline> rockets = new HashMap<Integer,RocketOnline>();
+	private Marker mPadMarker;
+	private boolean pad_set;
+	private Polyline mPolyline;
+
+	private View map_view;
+
+	private double mapAccuracy = -1;
+
+	private AltosLatLon my_position = null;
+	private AltosLatLon target_position = null;
+
+	public void onCreateView(final int map_type) {
+		mMapFragment = new SupportMapFragment() {
+			@Override
+			public void onActivityCreated(Bundle savedInstanceState) {
+				super.onActivityCreated(savedInstanceState);
+				setupMap(map_type);
+			}
+			@Override
+			public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
+				map_view = super.onCreateView(inflater, container, savedInstanceState);
+				return map_view;
+			}
+			@Override
+			public void onDestroyView() {
+				super.onDestroyView();
+				map_view = null;
+			}
+		};
+	}
+
+//	public void onActivityCreated() {
+//		getChildFragmentManager().beginTransaction().add(R.id.map, mMapFragment).commit();
+//	}
+
+	public void setupMap(int map_type) {
+		mMap = mMapFragment.getMap();
+		if (mMap != null) {
+			set_map_type(map_type);
+			mMap.setMyLocationEnabled(true);
+			mMap.getUiSettings().setTiltGesturesEnabled(false);
+			mMap.getUiSettings().setZoomControlsEnabled(false);
+
+			mPadMarker = mMap.addMarker(
+					new MarkerOptions().icon(BitmapDescriptorFactory.fromResource(R.drawable.pad))
+					                   .position(new LatLng(0,0))
+					                   .visible(false)
+					);
+
+			mPolyline = mMap.addPolyline(
+					new PolylineOptions().add(new LatLng(0,0), new LatLng(0,0))
+					                     .width(20)
+					                     .color(Color.BLUE)
+					                     .visible(false)
+					);
+
+			mapLoaded = true;
+		}
+	}
+
+	public void center(double lat, double lon, double accuracy) {
+		if (mMap == null)
+			return;
+
+		if (mapAccuracy < 0 || accuracy < mapAccuracy/10) {
+			mMap.moveCamera(CameraUpdateFactory.newLatLngZoom(new LatLng(lat, lon),14));
+			mapAccuracy = accuracy;
+		}
+	}
+
+	private void set_rocket(int serial, AltosState state) {
+		RocketOnline	rocket;
+
+		if (state.gps == null || state.gps.lat == AltosLib.MISSING)
+			return;
+
+		if (mMap == null)
+			return;
+
+		if (rockets.containsKey(serial)) {
+			rocket = rockets.get(serial);
+			rocket.set_position(new AltosLatLon(state.gps.lat, state.gps.lon), state.received_time);
+		} else {
+			rocket = new RocketOnline(context,
+						  String.format("%d", serial),
+						  mMap, state.gps.lat, state.gps.lon,
+						  state.received_time);
+			rockets.put(serial, rocket);
+		}
+	}
+
+	private void remove_rocket(int serial) {
+		RocketOnline rocket = rockets.get(serial);
+		rocket.remove();
+		rockets.remove(serial);
+	}
+
+	public void set_visible(boolean visible) {
+		if (map_view == null)
+			return;
+		if (visible)
+			map_view.setVisibility(View.VISIBLE);
+		else
+			map_view.setVisibility(View.GONE);
+	}
+
+	public void show(TelemetryState telem_state, AltosState state, AltosGreatCircle from_receiver, Location receiver) {
+
+		if (telem_state != null) {
+			for (int serial : rockets.keySet()) {
+				if (!telem_state.states.containsKey(serial))
+					remove_rocket(serial);
+			}
+
+			for (int serial : telem_state.states.keySet()) {
+				set_rocket(serial, telem_state.states.get(serial));
+			}
+		}
+
+		if (state != null) {
+			if (mapLoaded) {
+				if (!pad_set && state.pad_lat != AltosLib.MISSING) {
+					pad_set = true;
+					mPadMarker.setPosition(new LatLng(state.pad_lat, state.pad_lon));
+					mPadMarker.setVisible(true);
+				}
+			}
+			if (state.gps != null) {
+
+				target_position = new AltosLatLon(state.gps.lat, state.gps.lon);
+				if (state.gps.locked && state.gps.nsat >= 4)
+					center (state.gps.lat, state.gps.lon, 10);
+			}
+		}
+
+		if (receiver != null) {
+			double accuracy;
+
+			if (receiver.hasAccuracy())
+				accuracy = receiver.getAccuracy();
+			else
+				accuracy = 1000;
+
+			my_position = new AltosLatLon(receiver.getLatitude(), receiver.getLongitude());
+			center (my_position.lat, my_position.lon, accuracy);
+		}
+
+		if (my_position != null && target_position != null) {
+			mPolyline.setPoints(Arrays.asList(new LatLng(my_position.lat, my_position.lon), new LatLng(target_position.lat, target_position.lon)));
+			mPolyline.setVisible(true);
+		}
+
+	}
+
+	public void set_map_type(int map_type) {
+		if (mMap != null) {
+			if (map_type == AltosMap.maptype_hybrid)
+				mMap.setMapType(GoogleMap.MAP_TYPE_HYBRID);
+			else if (map_type == AltosMap.maptype_satellite)
+				mMap.setMapType(GoogleMap.MAP_TYPE_SATELLITE);
+			else if (map_type == AltosMap.maptype_terrain)
+				mMap.setMapType(GoogleMap.MAP_TYPE_TERRAIN);
+			else
+				mMap.setMapType(GoogleMap.MAP_TYPE_NORMAL);
+		}
+	}
+
+	public AltosMapOnline(Context context) {
+		this.context = context;
+	}
+}
diff --git a/altosdroid/src/org/altusmetrum/AltosDroid/AltosMapView.java b/altosdroid/src/org/altusmetrum/AltosDroid/AltosMapView.java
deleted file mode 100644
index 65cc0b95..00000000
--- a/altosdroid/src/org/altusmetrum/AltosDroid/AltosMapView.java
+++ /dev/null
@@ -1,168 +0,0 @@
-/*
- * Copyright © 2015 Keith Packard <keithp@keithp.com>
- *
- * 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.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
- */
-
-package org.altusmetrum.AltosDroid;
-
-import java.util.*;
-import java.io.*;
-
-import org.altusmetrum.altoslib_7.*;
-
-import android.app.Activity;
-import android.graphics.*;
-import android.os.Bundle;
-import android.support.v4.app.Fragment;
-import android.support.v4.app.FragmentTransaction;
-import android.view.*;
-import android.widget.*;
-import android.location.Location;
-import android.content.*;
-import android.util.*;
-
-public class AltosMapView extends View implements ScaleGestureDetector.OnScaleGestureListener {
-	ScaleGestureDetector	scale_detector;
-	boolean			scaling;
-	TabMapOffline		tab;
-
-	class Line {
-		AltosLatLon	a, b;
-
-		void paint() {
-			if (a != null && b != null) {
-				AltosPointDouble	a_screen = tab.map.transform.screen(a);
-				AltosPointDouble	b_screen = tab.map.transform.screen(b);
-				tab.paint.setColor(0xff8080ff);
-				tab.canvas.drawLine((float) a_screen.x, (float) a_screen.y,
-						    (float) b_screen.x, (float) b_screen.y,
-						    tab.paint);
-			}
-		}
-
-		void set_a(AltosLatLon a) {
-			this.a = a;
-		}
-
-		void set_b(AltosLatLon b) {
-			this.b = b;
-		}
-
-		Line() {
-		}
-	}
-
-	Line line = new Line();
-
-	private void draw_bitmap(AltosLatLon lat_lon, Bitmap bitmap, int off_x, int off_y) {
-		if (lat_lon != null && tab.map != null && tab.map.transform != null) {
-			AltosPointInt pt = new AltosPointInt(tab.map.transform.screen(lat_lon));
-
-			tab.canvas.drawBitmap(bitmap, pt.x - off_x, pt.y - off_y, tab.paint);
-		}
-	}
-
-	private void draw_positions() {
-		line.set_a(tab.map.last_position);
-		line.set_b(tab.here);
-		line.paint();
-		draw_bitmap(tab.pad, tab.pad_bitmap, tab.pad_off_x, tab.pad_off_y);
-
-		Rocket[]	rockets = tab.rockets.values().toArray(new Rocket[0]);
-
-		Arrays.sort(rockets);
-		for (Rocket rocket : rockets)
-			rocket.paint();
-		draw_bitmap(tab.here, tab.here_bitmap, tab.here_off_x, tab.here_off_y);
-	}
-
-	@Override public void invalidate() {
-		Rect r = new Rect();
-		getDrawingRect(r);
-		super.invalidate();
-	}
-
-	@Override public void invalidate(int l, int t, int r, int b) {
-		Rect rect = new Rect();
-		getDrawingRect(rect);
-		super.invalidate();
-	}
-
-	@Override
-	protected void onDraw(Canvas view_canvas) {
-		tab.canvas = view_canvas;
-		tab.paint = new Paint(Paint.ANTI_ALIAS_FLAG);
-		tab.paint.setStrokeWidth(tab.stroke_width);
-		tab.paint.setStrokeCap(Paint.Cap.ROUND);
-		tab.paint.setStrokeJoin(Paint.Join.ROUND);
-		tab.paint.setTextSize(40);
-		tab.map.paint();
-		draw_positions();
-		tab.canvas = null;
-	}
-
-	public boolean onScale(ScaleGestureDetector detector) {
-		float	f = detector.getScaleFactor();
-
-		if (f <= 0.8) {
-			tab.map.set_zoom_centre(tab.map.get_zoom() - 1, new AltosPointInt((int) detector.getFocusX(), (int) detector.getFocusY()));
-			return true;
-		}
-		if (f >= 1.2) {
-			tab.map.set_zoom_centre(tab.map.get_zoom() + 1, new AltosPointInt((int) detector.getFocusX(), (int) detector.getFocusY()));
-			return true;
-		}
-		return false;
-	}
-
-	public boolean onScaleBegin(ScaleGestureDetector detector) {
-		return true;
-	}
-
-	public void onScaleEnd(ScaleGestureDetector detector) {
-	}
-
-	@Override
-	public boolean dispatchTouchEvent(MotionEvent event) {
-		scale_detector.onTouchEvent(event);
-
-		if (scale_detector.isInProgress()) {
-			scaling = true;
-		}
-
-		if (scaling) {
-			if (event.getAction() == MotionEvent.ACTION_UP) {
-				scaling = false;
-			}
-			return true;
-		}
-
-		if (event.getAction() == MotionEvent.ACTION_DOWN) {
-			tab.map.touch_start((int) event.getX(), (int) event.getY(), true);
-		} else if (event.getAction() == MotionEvent.ACTION_MOVE) {
-			tab.map.touch_continue((int) event.getX(), (int) event.getY(), true);
-		}
-		return true;
-	}
-
-	public void set_tab(TabMapOffline tab) {
-		this.tab = tab;
-	}
-
-	public AltosMapView(Context context, AttributeSet attrs) {
-		super(context, attrs);
-		scale_detector = new ScaleGestureDetector(context, this);
-	}
-}
diff --git a/altosdroid/src/org/altusmetrum/AltosDroid/TabMap.java b/altosdroid/src/org/altusmetrum/AltosDroid/TabMap.java
index d5d1d262..ee52d637 100644
--- a/altosdroid/src/org/altusmetrum/AltosDroid/TabMap.java
+++ b/altosdroid/src/org/altusmetrum/AltosDroid/TabMap.java
@@ -112,7 +112,6 @@ public class TabMap extends AltosDroidTab {
 				setupMap();
 			}
 		};
-
 	}
 
 	@Override
diff --git a/altosdroid/src/org/altusmetrum/AltosDroid/TabMapOffline.java b/altosdroid/src/org/altusmetrum/AltosDroid/TabMapOffline.java
index 296e2122..26e04c83 100644
--- a/altosdroid/src/org/altusmetrum/AltosDroid/TabMapOffline.java
+++ b/altosdroid/src/org/altusmetrum/AltosDroid/TabMapOffline.java
@@ -32,58 +32,9 @@ import android.widget.*;
 import android.location.Location;
 import android.content.*;
 
-class Rocket implements Comparable {
-	AltosLatLon	position;
-	String		name;
-	long		last_packet;
-	TabMapOffline	tab;
-
-	void paint() {
-		tab.draw_bitmap(position, tab.rocket_bitmap, tab.rocket_off_x, tab.rocket_off_y);
-		tab.draw_text(position, name, 0, 3*tab.rocket_bitmap.getHeight()/4);
-	}
-
-	void set_position(AltosLatLon position, long last_packet) {
-		this.position = position;
-		this.last_packet = last_packet;
-	}
-
-	Rocket(String name, TabMapOffline tab) {
-		this.name = name;
-		this.tab = tab;
-	}
-
-	public int compareTo(Object o) {
-		Rocket other = (Rocket) o;
-
-		long	diff = last_packet - other.last_packet;
-
-		if (diff > 0)
-			return 1;
-		if (diff < 0)
-			return -1;
-		return 0;
-	}
-}
-
-public class TabMapOffline extends AltosDroidTab implements AltosMapInterface {
-
-	AltosMap map;
+public class TabMapOffline extends AltosDroidTab {
 
 	AltosLatLon	here;
-	AltosLatLon	pad;
-
-	Canvas	canvas;
-	Paint	paint;
-
-	Bitmap	pad_bitmap;
-	int	pad_off_x, pad_off_y;
-	Bitmap	rocket_bitmap;
-	int	rocket_off_x, rocket_off_y;
-	Bitmap	here_bitmap;
-	int	here_off_x, here_off_y;
-
-	private boolean pad_set;
 
 	private TextView mDistanceView;
 	private TextView mBearingView;
@@ -91,221 +42,14 @@ public class TabMapOffline extends AltosDroidTab implements AltosMapInterface {
 	private TextView mTargetLongitudeView;
 	private TextView mReceiverLatitudeView;
 	private TextView mReceiverLongitudeView;
-	private AltosMapView map_view;
-
-	private double mapAccuracy = -1;
-
-	int	stroke_width = 20;
-
-
-	void draw_text(AltosLatLon lat_lon, String text, int off_x, int off_y) {
-		if (lat_lon != null && map != null && map.transform != null) {
-			AltosPointInt pt = new AltosPointInt(map.transform.screen(lat_lon));
-
-			Rect	bounds = new Rect();
-			paint.getTextBounds(text, 0, text.length(), bounds);
-
-			int	width = bounds.right - bounds.left;
-			int	height = bounds.bottom - bounds.top;
-
-			float x = pt.x;
-			float y = pt.y;
-			x = x - width / 2.0f - off_x;
-			y = y + height / 2.0f - off_y;
-			paint.setColor(0xff000000);
-			canvas.drawText(text, 0, text.length(), x, y, paint);
-		}
-	}
-
-	void draw_bitmap(AltosLatLon lat_lon, Bitmap bitmap, int off_x, int off_y) {
-		if (lat_lon != null && map != null && map.transform != null) {
-			AltosPointInt pt = new AltosPointInt(map.transform.screen(lat_lon));
-
-			canvas.drawBitmap(bitmap, pt.x - off_x, pt.y - off_y, paint);
-		}
-	}
-
-	HashMap<Integer,Rocket> rockets = new HashMap<Integer,Rocket>();
-
-	/* AltosMapInterface */
-
-	static  final int	WHITE = 0xffffffff;
-	static  final int	RED   = 0xffff0000;
-	static  final int	PINK  = 0xffff8080;
-	static  final int	YELLOW= 0xffffff00;
-	static  final int	CYAN  = 0xff00ffff;
-	static  final int	BLUE  = 0xff0000ff;
-	static  final int	BLACK = 0xff000000;
-
-	public static final int stateColors[] = {
-		WHITE,  // startup
-		WHITE,  // idle
-		WHITE,  // pad
-		RED,    // boost
-		PINK,   // fast
-		YELLOW, // coast
-		CYAN,   // drogue
-		BLUE,   // main
-		BLACK,  // landed
-		BLACK,  // invalid
-		CYAN,   // stateless
-	};
-
-	public AltosMapPath new_path() {
-		return null;
-	}
-
-	public AltosMapLine new_line() {
-		return null;
-	}
-
-	class MapImage implements AltosImage {
-		public Bitmap	bitmap;
-
-		public void flush() {
-			if (bitmap != null) {
-				bitmap.recycle();
-				bitmap = null;
-			}
-		}
-
-		public MapImage(File file) {
-			bitmap = BitmapFactory.decodeFile(file.getPath());
-		}
-	}
-
-	public AltosImage load_image(File file) throws Exception {
-		return new MapImage(file);
-	}
-
-	class MapMark extends AltosMapMark {
-		public void paint(AltosMapTransform t) {
-		}
-
-		MapMark(double lat, double lon, int state) {
-			super(lat, lon, state);
-		}
-	}
-
-	public AltosMapMark new_mark(double lat, double lon, int state) {
-		return new MapMark(lat, lon, state);
-	}
-
-	class MapTile extends AltosMapTile {
-		public void paint(AltosMapTransform t) {
-			AltosPointInt		pt = new AltosPointInt(t.screen(upper_left));
-
-			if (canvas.quickReject(pt.x, pt.y, pt.x + px_size, pt.y + px_size, Canvas.EdgeType.AA))
-				return;
-
-			AltosImage		altos_image = cache.get(this, store, px_size, px_size);
-
-			MapImage 		map_image = (MapImage) altos_image;
-
-			Bitmap			bitmap = null;
-
-			if (map_image != null)
-				bitmap = map_image.bitmap;
-
-			if (bitmap != null) {
-				canvas.drawBitmap(bitmap, pt.x, pt.y, paint);
-			} else {
-				paint.setColor(0xff808080);
-				canvas.drawRect(pt.x, pt.y, pt.x + px_size, pt.y + px_size, paint);
-				if (t.has_location()) {
-					String	message = null;
-					switch (status) {
-					case AltosMapTile.loading:
-						message = "Loading...";
-						break;
-					case AltosMapTile.bad_request:
-						message = "Internal error";
-						break;
-					case AltosMapTile.failed:
-						message = "Network error, check connection";
-						break;
-					case AltosMapTile.forbidden:
-						message = "Too many requests, try later";
-						break;
-					}
-					if (message != null) {
-						Rect	bounds = new Rect();
-						paint.getTextBounds(message, 0, message.length(), bounds);
-
-						int	width = bounds.right - bounds.left;
-						int	height = bounds.bottom - bounds.top;
-
-						float x = pt.x + px_size / 2.0f;
-						float y = pt.y + px_size / 2.0f;
-						x = x - width / 2.0f;
-						y = y + height / 2.0f;
-						paint.setColor(0xff000000);
-						canvas.drawText(message, 0, message.length(), x, y, paint);
-					}
-				}
-			}
-		}
-
-		public MapTile(AltosMapTileListener listener, AltosLatLon upper_left, AltosLatLon center, int zoom, int maptype, int px_size) {
-			super(listener, upper_left, center, zoom, maptype, px_size, 2);
-		}
-
-	}
-
-	public AltosMapTile new_tile(AltosMapTileListener listener, AltosLatLon upper_left, AltosLatLon center, int zoom, int maptype, int px_size) {
-		return new MapTile(listener, upper_left, center, zoom, maptype, px_size);
-	}
-
-	public int width() {
-		if (map_view != null)
-			return map_view.getWidth();
-		return 500;
-	}
-
-	public int height() {
-		if (map_view != null)
-			return map_view.getHeight();
-		return 500;
-	}
-
-	public void repaint() {
-		if (map_view != null)
-			map_view.postInvalidate();
-	}
-
-	public void repaint(AltosRectangle damage) {
-		if (map_view != null)
-			map_view.postInvalidate(damage.x, damage.y, damage.x + damage.width, damage.y + damage.height);
-	}
-
-	public void set_zoom_label(String label) {
-	}
-
-	public void debug(String format, Object ... arguments) {
-		AltosDebug.debug(format, arguments);
-	}
+	private AltosMapOffline map_offline;
+	private AltosMapOnline map_online;
+	private View view;
+	private int map_source;
 
 	@Override
 	public void onAttach(Activity activity) {
 		super.onAttach(activity);
-
-		map = new AltosMap(this);
-		map.set_maptype(altos_droid.map_type);
-
-		pad_bitmap = BitmapFactory.decodeResource(getResources(), R.drawable.pad);
-		/* arrow at the bottom of the launchpad image */
-		pad_off_x = pad_bitmap.getWidth() / 2;
-		pad_off_y = pad_bitmap.getHeight();
-
-		rocket_bitmap = BitmapFactory.decodeResource(getResources(), R.drawable.rocket);
-		/* arrow at the bottom of the rocket image */
-		rocket_off_x = rocket_bitmap.getWidth() / 2;
-		rocket_off_y = rocket_bitmap.getHeight();
-
-		here_bitmap = BitmapFactory.decodeResource(getResources(), R.drawable.ic_maps_indicator_current_position);
-		/* Center of the dot */
-		here_off_x = here_bitmap.getWidth() / 2;
-		here_off_y = here_bitmap.getHeight() / 2;
 	}
 
 	@Override
@@ -313,42 +57,54 @@ public class TabMapOffline extends AltosDroidTab implements AltosMapInterface {
 		super.onCreate(savedInstanceState);
 	}
 
+	private void make_offline_map() {
+	}
+
+	private void make_online_map() {
+		map_online = new AltosMapOnline(view.getContext());
+		map_online.onCreateView(altos_droid.map_type);
+	}
+
 	@Override
 	public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
-		View v = inflater.inflate(R.layout.tab_map_offline, container, false);
-
-		map_view = (AltosMapView)v.findViewById(R.id.map_view_offline);
-		map_view.set_tab(this);
-		mDistanceView  = (TextView)v.findViewById(R.id.distance_value_offline);
-		mBearingView   = (TextView)v.findViewById(R.id.bearing_value_offline);
-		mTargetLatitudeView  = (TextView)v.findViewById(R.id.target_lat_value_offline);
-		mTargetLongitudeView = (TextView)v.findViewById(R.id.target_lon_value_offline);
-		mReceiverLatitudeView  = (TextView)v.findViewById(R.id.receiver_lat_value_offline);
-		mReceiverLongitudeView = (TextView)v.findViewById(R.id.receiver_lon_value_offline);
-		return v;
+		view = inflater.inflate(R.layout.tab_map_offline, container, false);
+		int map_source = AltosDroidPreferences.map_source();
+
+		mDistanceView  = (TextView)view.findViewById(R.id.distance_value_offline);
+		mBearingView   = (TextView)view.findViewById(R.id.bearing_value_offline);
+		mTargetLatitudeView  = (TextView)view.findViewById(R.id.target_lat_value_offline);
+		mTargetLongitudeView = (TextView)view.findViewById(R.id.target_lon_value_offline);
+		mReceiverLatitudeView  = (TextView)view.findViewById(R.id.receiver_lat_value_offline);
+		mReceiverLongitudeView = (TextView)view.findViewById(R.id.receiver_lon_value_offline);
+		map_offline = (AltosMapOffline)view.findViewById(R.id.map_view_offline);
+		map_offline.onCreateView(altos_droid.map_type);
+		map_online = new AltosMapOnline(view.getContext());
+		map_online.onCreateView(altos_droid.map_type);
+		set_map_source(AltosDroidPreferences.map_source());
+		return view;
 	}
 
 	@Override
 	public void onActivityCreated(Bundle savedInstanceState) {
 		super.onActivityCreated(savedInstanceState);
+		if (map_online != null)
+			getChildFragmentManager().beginTransaction().add(R.id.map_online, map_online.mMapFragment).commit();
 	}
 
 	@Override
 	public void onDestroyView() {
 		super.onDestroyView();
-
 	}
 
+	public String tab_name() { return "offmap"; }
+
 	private void center(double lat, double lon, double accuracy) {
-		if (mapAccuracy < 0 || accuracy < mapAccuracy/10) {
-			if (map != null)
-				map.maybe_centre(lat, lon);
-			mapAccuracy = accuracy;
-		}
+		if (map_offline != null)
+			map_offline.center(lat, lon, accuracy);
+		if (map_online != null)
+			map_online.center(lat, lon, accuracy);
 	}
 
-	public String tab_name() { return "offmap"; }
-
 	public void show(TelemetryState telem_state, AltosState state, AltosGreatCircle from_receiver, Location receiver) {
 		if (from_receiver != null) {
 			mBearingView.setText(String.format("%3.0f°", from_receiver.bearing));
@@ -356,40 +112,9 @@ public class TabMapOffline extends AltosDroidTab implements AltosMapInterface {
 		}
 
 		if (state != null) {
-			map.show(state, null);
 			if (state.gps != null) {
 				mTargetLatitudeView.setText(AltosDroid.pos(state.gps.lat, "N", "S"));
 				mTargetLongitudeView.setText(AltosDroid.pos(state.gps.lon, "E", "W"));
-				if (state.gps.locked && state.gps.nsat >= 4)
-					center (state.gps.lat, state.gps.lon, 10);
-			}
-			if (state.pad_lat != AltosLib.MISSING && pad == null)
-				pad = new AltosLatLon(state.pad_lat, state.pad_lon);
-		}
-
-		if (telem_state != null) {
-			Integer[] old_serial = rockets.keySet().toArray(new Integer[0]);
-			Integer[] new_serial = telem_state.states.keySet().toArray(new Integer[0]);
-
-			/* remove deleted keys */
-			for (int serial : old_serial) {
-				if (!telem_state.states.containsKey(serial))
-					rockets.remove(serial);
-			}
-
-			/* set remaining keys */
-
-			for (int serial : new_serial) {
-				Rocket 		rocket;
-				AltosState	t_state = telem_state.states.get(serial);
-				if (rockets.containsKey(serial))
-					rocket = rockets.get(serial);
-				else {
-					rocket = new Rocket(String.format("%d", serial), this);
-					rockets.put(serial, rocket);
-				}
-				if (t_state.gps != null)
-					rocket.set_position(new AltosLatLon(t_state.gps.lat, t_state.gps.lon), t_state.received_time);
 			}
 		}
 
@@ -405,13 +130,41 @@ public class TabMapOffline extends AltosDroidTab implements AltosMapInterface {
 			mReceiverLongitudeView.setText(AltosDroid.pos(here.lon, "E", "W"));
 			center (here.lat, here.lon, accuracy);
 		}
-
+		if (map_source == AltosDroidPreferences.MAP_SOURCE_OFFLINE) {
+			if (map_offline != null)
+				map_offline.show(telem_state, state, from_receiver, receiver);
+		} else {
+			if (map_online != null)
+				map_online.show(telem_state, state, from_receiver, receiver);
+		}
 	}
 
 	@Override
 	public void set_map_type(int map_type) {
-		if (map != null)
-			map.set_maptype(map_type);
+		if (map_offline != null)
+			map_offline.set_map_type(map_type);
+		if (map_online != null)
+			map_online.set_map_type(map_type);
+	}
+
+	@Override
+	public void set_map_source(int map_source) {
+		this.map_source = map_source;
+		if (map_source == AltosDroidPreferences.MAP_SOURCE_OFFLINE) {
+			if (map_online != null)
+				map_online.set_visible(false);
+			if (map_offline != null) {
+				map_offline.set_visible(true);
+				map_offline.show(last_telem_state, last_state, last_from_receiver, last_receiver);
+			}
+		} else {
+			if (map_offline != null)
+				map_offline.set_visible(false);
+			if (map_online != null) {
+				map_online.set_visible(true);
+				map_online.show(last_telem_state, last_state, last_from_receiver, last_receiver);
+			}
+		}
 	}
 
 	public TabMapOffline() {
-- 
cgit v1.2.3


From a959c1926048d1b96a06aa291131afd7c8e771c7 Mon Sep 17 00:00:00 2001
From: Keith Packard <keithp@keithp.com>
Date: Mon, 22 Jun 2015 18:41:01 -0700
Subject: altosdroid: Get rid of on-line only maps tab

The offline tab did both, so delete the online one and replace it with
the offline one.

Signed-off-by: Keith Packard <keithp@keithp.com>
---
 altosdroid/res/layout/tab_map.xml                  | 340 +++++++++++----------
 altosdroid/res/layout/tab_map_offline.xml          | 199 ------------
 .../src/org/altusmetrum/AltosDroid/AltosDroid.java |   1 -
 .../src/org/altusmetrum/AltosDroid/TabMap.java     | 251 +++++----------
 .../org/altusmetrum/AltosDroid/TabMapOffline.java  | 172 -----------
 5 files changed, 255 insertions(+), 708 deletions(-)
 delete mode 100644 altosdroid/res/layout/tab_map_offline.xml
 delete mode 100644 altosdroid/src/org/altusmetrum/AltosDroid/TabMapOffline.java

(limited to 'altosdroid/res')

diff --git a/altosdroid/res/layout/tab_map.xml b/altosdroid/res/layout/tab_map.xml
index b4c97f91..2388a20b 100644
--- a/altosdroid/res/layout/tab_map.xml
+++ b/altosdroid/res/layout/tab_map.xml
@@ -20,168 +20,180 @@
 	android:layout_height="match_parent"
 	android:orientation="vertical" >
 
-  	<LinearLayout
-	    android:id="@+id/map"
-	    android:orientation="horizontal"
-	    android:layout_width="fill_parent"
-	    android:layout_height="fill_parent"
-	    android:layout_weight="1">
-	</LinearLayout>
-
-	<LinearLayout
-		xmlns:android="http://schemas.android.com/apk/res/android"
-		android:layout_width="fill_parent"
-		android:layout_height="wrap_content"
-		android:baselineAligned="true"
-		android:orientation="horizontal" >
-
-		<RelativeLayout
-			android:layout_width="0dp"
-			android:layout_height="wrap_content"
-			android:layout_weight="1"
-			android:paddingTop="5dp" >
-
-			<TextView
-				android:id="@+id/distance_label"
-				android:layout_width="wrap_content"
-				android:layout_height="wrap_content"
-				android:paddingRight="4dp"
-				android:text="@string/distance_label" />
-
-			<TextView
-				android:id="@+id/distance_value"
-				android:layout_width="wrap_content"
-				android:layout_height="wrap_content"
-				android:layout_toRightOf="@+id/distance_label"
-				android:text=""
-				android:textAppearance="?android:attr/textAppearanceSmall" />
-		</RelativeLayout>
-
-		<RelativeLayout
-			android:layout_width="0dp"
-			android:layout_height="wrap_content"
-			android:layout_weight="1"
-			android:paddingTop="5dp" >
-
-			<TextView
-				android:id="@+id/bearing_label"
-				android:layout_width="wrap_content"
-				android:layout_height="wrap_content"
-				android:paddingRight="4dp"
-				android:text="@string/bearing_label" />
-
-			<TextView
-				android:id="@+id/bearing_value"
-				android:layout_width="wrap_content"
-				android:layout_height="wrap_content"
-				android:layout_toRightOf="@+id/bearing_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:baselineAligned="true"
-		android:orientation="horizontal" >
-
-		<RelativeLayout
-			android:layout_width="0dp"
-			android:layout_height="wrap_content"
-			android:layout_weight="1"
-			android:paddingTop="5dp" >
-
-			<TextView
-				android:id="@+id/target_lat_label"
-				android:layout_width="wrap_content"
-				android:layout_height="wrap_content"
-				android:paddingRight="4dp"
-				android:text="@string/target_latitude_label" />
-
-			<TextView
-				android:id="@+id/target_lat_value"
-				android:layout_width="wrap_content"
-				android:layout_height="wrap_content"
-				android:layout_toRightOf="@id/target_lat_label"
-				android:text=""
-				android:textAppearance="?android:attr/textAppearanceSmall" />
-		</RelativeLayout>
-
-		<RelativeLayout
-			android:layout_width="0dp"
-			android:layout_height="wrap_content"
-			android:layout_weight="1"
-			android:paddingTop="5dp" >
-
-			<TextView
-				android:id="@+id/target_lon_label"
-				android:layout_width="wrap_content"
-				android:layout_height="wrap_content"
-				android:paddingRight="4dp"
-				android:text="@string/target_longitude_label" />
-
-			<TextView
-				android:id="@+id/target_lon_value"
-				android:layout_width="wrap_content"
-				android:layout_height="wrap_content"
-				android:layout_toRightOf="@id/target_lon_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:baselineAligned="true"
-		android:orientation="horizontal" >
-
-		<RelativeLayout
-			android:layout_width="0dp"
-			android:layout_height="wrap_content"
-			android:layout_weight="1"
-			android:paddingTop="5dp" >
-
-			<TextView
-				android:id="@+id/receiver_lat_label"
-				android:layout_width="wrap_content"
-				android:layout_height="wrap_content"
-				android:paddingRight="4dp"
-				android:text="@string/receiver_latitude_label" />
-
-			<TextView
-				android:id="@+id/receiver_lat_value"
-				android:layout_width="wrap_content"
-				android:layout_height="wrap_content"
-				android:layout_toRightOf="@id/receiver_lat_label"
-				android:text=""
-				android:textAppearance="?android:attr/textAppearanceSmall" />
-		</RelativeLayout>
-
-		<RelativeLayout
-			android:layout_width="0dp"
-			android:layout_height="wrap_content"
-			android:layout_weight="1"
-			android:paddingTop="5dp" >
-
-			<TextView
-				android:id="@+id/receiver_lon_label"
-				android:layout_width="wrap_content"
-				android:layout_height="wrap_content"
-				android:paddingRight="4dp"
-				android:text="@string/receiver_longitude_label" />
-
-			<TextView
-				android:id="@+id/receiver_lon_value"
-				android:layout_width="wrap_content"
-				android:layout_height="wrap_content"
-				android:layout_toRightOf="@id/receiver_lon_label"
-				android:text=""
-				android:textAppearance="?android:attr/textAppearanceSmall" />
-		</RelativeLayout>
-	</LinearLayout>
+  <FrameLayout
+      android:layout_width="fill_parent"
+      android:layout_height="wrap_content"
+      android:baselineAligned="true"
+      android:orientation="horizontal"
+      android:layout_weight="1">
+    <LinearLayout
+	android:id="@+id/map_online"
+	android:orientation="horizontal"
+	android:layout_width="fill_parent"
+	android:layout_height="fill_parent"
+	android:layout_weight="1">
+    </LinearLayout>
+    <org.altusmetrum.AltosDroid.AltosMapOffline android:id="@+id/map_offline"
+						android:layout_width="fill_parent"
+						android:layout_height="wrap_content"
+						android:layout_weight="1"
+						/>
+  </FrameLayout>
+  
+  <LinearLayout
+      xmlns:android="http://schemas.android.com/apk/res/android"
+      android:layout_width="fill_parent"
+      android:layout_height="wrap_content"
+      android:baselineAligned="true"
+      android:orientation="horizontal" >
+
+    <RelativeLayout
+	android:layout_width="0dp"
+	android:layout_height="wrap_content"
+	android:layout_weight="1"
+	android:paddingTop="5dp" >
+
+      <TextView
+	  android:id="@+id/distance_label"
+	  android:layout_width="wrap_content"
+	  android:layout_height="wrap_content"
+	  android:paddingRight="4dp"
+	  android:text="@string/distance_label" />
+
+      <TextView
+	  android:id="@+id/distance_value"
+	  android:layout_width="wrap_content"
+	  android:layout_height="wrap_content"
+	  android:layout_toRightOf="@id/distance_label"
+	  android:text=""
+	  android:textAppearance="?android:attr/textAppearanceSmall" />
+    </RelativeLayout>
+
+    <RelativeLayout
+	android:layout_width="0dp"
+	android:layout_height="wrap_content"
+	android:layout_weight="1"
+	android:paddingTop="5dp" >
+
+      <TextView
+	  android:id="@+id/bearing_label"
+	  android:layout_width="wrap_content"
+	  android:layout_height="wrap_content"
+	  android:paddingRight="4dp"
+	  android:text="@string/bearing_label" />
+
+      <TextView
+	  android:id="@+id/bearing_value"
+	  android:layout_width="wrap_content"
+	  android:layout_height="wrap_content"
+	  android:layout_toRightOf="@id/bearing_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:baselineAligned="true"
+      android:orientation="horizontal" >
+
+    <RelativeLayout
+	android:layout_width="0dp"
+	android:layout_height="wrap_content"
+	android:layout_weight="1"
+	android:paddingTop="5dp" >
+
+      <TextView
+	  android:id="@+id/target_lat_label"
+	  android:layout_width="wrap_content"
+	  android:layout_height="wrap_content"
+	  android:paddingRight="4dp"
+	  android:text="@string/target_latitude_label" />
+
+      <TextView
+	  android:id="@+id/target_lat_value"
+	  android:layout_width="wrap_content"
+	  android:layout_height="wrap_content"
+	  android:layout_toRightOf="@id/target_lat_label"
+	  android:text=""
+	  android:textAppearance="?android:attr/textAppearanceSmall" />
+    </RelativeLayout>
+
+    <RelativeLayout
+	android:layout_width="0dp"
+	android:layout_height="wrap_content"
+	android:layout_weight="1"
+	android:paddingTop="5dp" >
+
+      <TextView
+	  android:id="@+id/target_lon_label"
+	  android:layout_width="wrap_content"
+	  android:layout_height="wrap_content"
+	  android:paddingRight="4dp"
+	  android:text="@string/target_longitude_label" />
+
+      <TextView
+	  android:id="@+id/target_lon_value"
+	  android:layout_width="wrap_content"
+	  android:layout_height="wrap_content"
+	  android:layout_toRightOf="@id/target_lon_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:baselineAligned="true"
+      android:orientation="horizontal" >
+
+    <RelativeLayout
+	android:layout_width="0dp"
+	android:layout_height="wrap_content"
+	android:layout_weight="1"
+	android:paddingTop="5dp" >
+
+      <TextView
+	  android:id="@+id/receiver_lat_label"
+	  android:layout_width="wrap_content"
+	  android:layout_height="wrap_content"
+	  android:paddingRight="4dp"
+	  android:text="@string/receiver_latitude_label" />
+
+      <TextView
+	  android:id="@+id/receiver_lat_value"
+	  android:layout_width="wrap_content"
+	  android:layout_height="wrap_content"
+	  android:layout_toRightOf="@id/receiver_lat_label"
+	  android:text=""
+	  android:textAppearance="?android:attr/textAppearanceSmall" />
+    </RelativeLayout>
+
+    <RelativeLayout
+	android:layout_width="0dp"
+	android:layout_height="wrap_content"
+	android:layout_weight="1"
+	android:paddingTop="5dp" >
+
+      <TextView
+	  android:id="@+id/receiver_lon_label"
+	  android:layout_width="wrap_content"
+	  android:layout_height="wrap_content"
+	  android:paddingRight="4dp"
+	  android:text="@string/receiver_longitude_label" />
+
+      <TextView
+	  android:id="@+id/receiver_lon_value"
+	  android:layout_width="wrap_content"
+	  android:layout_height="wrap_content"
+	  android:layout_toRightOf="@id/receiver_lon_label"
+	  android:text=""
+	  android:textAppearance="?android:attr/textAppearanceSmall" />
+    </RelativeLayout>
+  </LinearLayout>
 </LinearLayout>
diff --git a/altosdroid/res/layout/tab_map_offline.xml b/altosdroid/res/layout/tab_map_offline.xml
deleted file mode 100644
index 1b0f28a7..00000000
--- a/altosdroid/res/layout/tab_map_offline.xml
+++ /dev/null
@@ -1,199 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-     Copyright © 2013 Mike Beattie <mike@ethernal.org>
-
-     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.
-
-     This program is distributed in the hope that it will be useful, but
-     WITHOUT ANY WARRANTY; without even the implied warranty of
-     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-     General Public License for more details.
-
-     You should have received a copy of the GNU General Public License along
-     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="match_parent"
-	android:layout_height="match_parent"
-	android:orientation="vertical" >
-
-  <FrameLayout
-      android:layout_width="fill_parent"
-      android:layout_height="wrap_content"
-      android:baselineAligned="true"
-      android:orientation="horizontal"
-      android:layout_weight="1">
-    <LinearLayout
-	android:id="@+id/map_online"
-	android:orientation="horizontal"
-	android:layout_width="fill_parent"
-	android:layout_height="fill_parent"
-	android:layout_weight="1">
-    </LinearLayout>
-    <org.altusmetrum.AltosDroid.AltosMapOffline android:id="@+id/map_view_offline"
-						android:layout_width="fill_parent"
-						android:layout_height="wrap_content"
-						android:layout_weight="1"
-						/>
-  </FrameLayout>
-  
-  <LinearLayout
-      xmlns:android="http://schemas.android.com/apk/res/android"
-      android:layout_width="fill_parent"
-      android:layout_height="wrap_content"
-      android:baselineAligned="true"
-      android:orientation="horizontal" >
-
-    <RelativeLayout
-	android:layout_width="0dp"
-	android:layout_height="wrap_content"
-	android:layout_weight="1"
-	android:paddingTop="5dp" >
-
-      <TextView
-	  android:id="@+id/distance_label_offline"
-	  android:layout_width="wrap_content"
-	  android:layout_height="wrap_content"
-	  android:paddingRight="4dp"
-	  android:text="@string/distance_label" />
-
-      <TextView
-	  android:id="@+id/distance_value_offline"
-	  android:layout_width="wrap_content"
-	  android:layout_height="wrap_content"
-	  android:layout_toRightOf="@id/distance_label_offline"
-	  android:text=""
-	  android:textAppearance="?android:attr/textAppearanceSmall" />
-    </RelativeLayout>
-
-    <RelativeLayout
-	android:layout_width="0dp"
-	android:layout_height="wrap_content"
-	android:layout_weight="1"
-	android:paddingTop="5dp" >
-
-      <TextView
-	  android:id="@+id/bearing_label_offline"
-	  android:layout_width="wrap_content"
-	  android:layout_height="wrap_content"
-	  android:paddingRight="4dp"
-	  android:text="@string/bearing_label" />
-
-      <TextView
-	  android:id="@+id/bearing_value_offline"
-	  android:layout_width="wrap_content"
-	  android:layout_height="wrap_content"
-	  android:layout_toRightOf="@id/bearing_label_offline"
-	  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:baselineAligned="true"
-      android:orientation="horizontal" >
-
-    <RelativeLayout
-	android:layout_width="0dp"
-	android:layout_height="wrap_content"
-	android:layout_weight="1"
-	android:paddingTop="5dp" >
-
-      <TextView
-	  android:id="@+id/target_lat_label_offline"
-	  android:layout_width="wrap_content"
-	  android:layout_height="wrap_content"
-	  android:paddingRight="4dp"
-	  android:text="@string/target_latitude_label" />
-
-      <TextView
-	  android:id="@+id/target_lat_value_offline"
-	  android:layout_width="wrap_content"
-	  android:layout_height="wrap_content"
-	  android:layout_toRightOf="@id/target_lat_label_offline"
-	  android:text=""
-	  android:textAppearance="?android:attr/textAppearanceSmall" />
-    </RelativeLayout>
-
-    <RelativeLayout
-	android:layout_width="0dp"
-	android:layout_height="wrap_content"
-	android:layout_weight="1"
-	android:paddingTop="5dp" >
-
-      <TextView
-	  android:id="@+id/target_lon_label_offline"
-	  android:layout_width="wrap_content"
-	  android:layout_height="wrap_content"
-	  android:paddingRight="4dp"
-	  android:text="@string/target_longitude_label" />
-
-      <TextView
-	  android:id="@+id/target_lon_value_offline"
-	  android:layout_width="wrap_content"
-	  android:layout_height="wrap_content"
-	  android:layout_toRightOf="@id/target_lon_label_offline"
-	  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:baselineAligned="true"
-      android:orientation="horizontal" >
-
-    <RelativeLayout
-	android:layout_width="0dp"
-	android:layout_height="wrap_content"
-	android:layout_weight="1"
-	android:paddingTop="5dp" >
-
-      <TextView
-	  android:id="@+id/receiver_lat_label_offline"
-	  android:layout_width="wrap_content"
-	  android:layout_height="wrap_content"
-	  android:paddingRight="4dp"
-	  android:text="@string/receiver_latitude_label" />
-
-      <TextView
-	  android:id="@+id/receiver_lat_value_offline"
-	  android:layout_width="wrap_content"
-	  android:layout_height="wrap_content"
-	  android:layout_toRightOf="@id/receiver_lat_label_offline"
-	  android:text=""
-	  android:textAppearance="?android:attr/textAppearanceSmall" />
-    </RelativeLayout>
-
-    <RelativeLayout
-	android:layout_width="0dp"
-	android:layout_height="wrap_content"
-	android:layout_weight="1"
-	android:paddingTop="5dp" >
-
-      <TextView
-	  android:id="@+id/receiver_lon_label_offline"
-	  android:layout_width="wrap_content"
-	  android:layout_height="wrap_content"
-	  android:paddingRight="4dp"
-	  android:text="@string/receiver_longitude_label" />
-
-      <TextView
-	  android:id="@+id/receiver_lon_value_offline"
-	  android:layout_width="wrap_content"
-	  android:layout_height="wrap_content"
-	  android:layout_toRightOf="@id/receiver_lon_label_offline"
-	  android:text=""
-	  android:textAppearance="?android:attr/textAppearanceSmall" />
-    </RelativeLayout>
-  </LinearLayout>
-</LinearLayout>
diff --git a/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java b/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java
index 426e2e84..f6645105 100644
--- a/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java
+++ b/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java
@@ -536,7 +536,6 @@ public class AltosDroid extends FragmentActivity implements AltosUnitsListener {
 		mTabsAdapter.addTab(mTabHost.newTabSpec("descent").setIndicator(create_tab_view("Descent")), TabDescent.class, null);
 		mTabsAdapter.addTab(mTabHost.newTabSpec("landed").setIndicator(create_tab_view("Landed")), TabLanded.class, null);
 		mTabsAdapter.addTab(mTabHost.newTabSpec("map").setIndicator(create_tab_view("Map")), TabMap.class, null);
-		mTabsAdapter.addTab(mTabHost.newTabSpec("offmap").setIndicator(create_tab_view("OffMap")), TabMapOffline.class, null);
 
 		// Display the Version
 		mVersion = (TextView) findViewById(R.id.version);
diff --git a/altosdroid/src/org/altusmetrum/AltosDroid/TabMap.java b/altosdroid/src/org/altusmetrum/AltosDroid/TabMap.java
index ee52d637..9c39e105 100644
--- a/altosdroid/src/org/altusmetrum/AltosDroid/TabMap.java
+++ b/altosdroid/src/org/altusmetrum/AltosDroid/TabMap.java
@@ -18,40 +18,23 @@
 package org.altusmetrum.AltosDroid;
 
 import java.util.*;
+import java.io.*;
 
 import org.altusmetrum.altoslib_7.*;
 
-import com.google.android.gms.maps.CameraUpdateFactory;
-import com.google.android.gms.maps.GoogleMap;
-import com.google.android.gms.maps.SupportMapFragment;
-import com.google.android.gms.maps.model.BitmapDescriptorFactory;
-import com.google.android.gms.maps.model.LatLng;
-import com.google.android.gms.maps.model.Marker;
-import com.google.android.gms.maps.model.MarkerOptions;
-import com.google.android.gms.maps.model.Polyline;
-import com.google.android.gms.maps.model.PolylineOptions;
-
 import android.app.Activity;
-import android.graphics.Color;
 import android.graphics.*;
 import android.os.Bundle;
 import android.support.v4.app.Fragment;
-//import android.support.v4.app.FragmentTransaction;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.TextView;
+import android.support.v4.app.FragmentTransaction;
+import android.view.*;
+import android.widget.*;
 import android.location.Location;
+import android.content.*;
 
 public class TabMap extends AltosDroidTab {
-	private SupportMapFragment mMapFragment;
-	private GoogleMap mMap;
-	private boolean mapLoaded = false;
 
-	private HashMap<Integer,Marker> rockets = new HashMap<Integer,Marker>();
-	private Marker mPadMarker;
-	private boolean pad_set;
-	private Polyline mPolyline;
+	AltosLatLon	here;
 
 	private TextView mDistanceView;
 	private TextView mBearingView;
@@ -59,135 +42,67 @@ public class TabMap extends AltosDroidTab {
 	private TextView mTargetLongitudeView;
 	private TextView mReceiverLatitudeView;
 	private TextView mReceiverLongitudeView;
+	private AltosMapOffline map_offline;
+	private AltosMapOnline map_online;
+	private View view;
+	private int map_source;
 
-	private double mapAccuracy = -1;
-
-	private AltosLatLon my_position = null;
-	private AltosLatLon target_position = null;
-
-	private Bitmap rocket_bitmap(String text) {
-
-		/* From: http://mapicons.nicolasmollet.com/markers/industry/military/missile-2/
-		 */
-		Bitmap orig_bitmap = BitmapFactory.decodeResource(getResources(), R.drawable.rocket);
-		Bitmap bitmap = orig_bitmap.copy(Bitmap.Config.ARGB_8888, true);
-
-		Canvas canvas = new Canvas(bitmap);
-		Paint paint = new Paint();
-		paint.setTextSize(40);
-		paint.setColor(0xff000000);
-
-		Rect	bounds = new Rect();
-		paint.getTextBounds(text, 0, text.length(), bounds);
-
-		int	width = bounds.right - bounds.left;
-		int	height = bounds.bottom - bounds.top;
-
-		float x = bitmap.getWidth() / 2.0f - width / 2.0f;
-		float y = bitmap.getHeight() / 2.0f - height / 2.0f;
-
-		AltosDebug.debug("map label x %f y %f\n", x, y);
-
-		canvas.drawText(text, 0, text.length(), x, y, paint);
-		return bitmap;
-	}
-
-	private Marker rocket_marker(int serial, double lat, double lon) {
-		Bitmap	bitmap = rocket_bitmap(String.format("%d", serial));
-
-		return mMap.addMarker(new MarkerOptions()
-				      .icon(BitmapDescriptorFactory.fromBitmap(bitmap))
-				      .position(new LatLng(lat, lon))
-				      .visible(true));
+	@Override
+	public void onAttach(Activity activity) {
+		super.onAttach(activity);
 	}
 
 	@Override
 	public void onCreate(Bundle savedInstanceState) {
 		super.onCreate(savedInstanceState);
+	}
 
-		mMapFragment = new SupportMapFragment() {
-			@Override
-			public void onActivityCreated(Bundle savedInstanceState) {
-				super.onActivityCreated(savedInstanceState);
-				setupMap();
-			}
-		};
+	private void make_offline_map() {
+	}
+
+	private void make_online_map() {
+		map_online = new AltosMapOnline(view.getContext());
+		map_online.onCreateView(altos_droid.map_type);
 	}
 
 	@Override
 	public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
-		View v = inflater.inflate(R.layout.tab_map, container, false);
-		mDistanceView  = (TextView)v.findViewById(R.id.distance_value);
-		mBearingView   = (TextView)v.findViewById(R.id.bearing_value);
-		mTargetLatitudeView  = (TextView)v.findViewById(R.id.target_lat_value);
-		mTargetLongitudeView = (TextView)v.findViewById(R.id.target_lon_value);
-		mReceiverLatitudeView  = (TextView)v.findViewById(R.id.receiver_lat_value);
-		mReceiverLongitudeView = (TextView)v.findViewById(R.id.receiver_lon_value);
-		return v;
+		view = inflater.inflate(R.layout.tab_map, container, false);
+		int map_source = AltosDroidPreferences.map_source();
+
+		mDistanceView  = (TextView)view.findViewById(R.id.distance_value);
+		mBearingView   = (TextView)view.findViewById(R.id.bearing_value);
+		mTargetLatitudeView  = (TextView)view.findViewById(R.id.target_lat_value);
+		mTargetLongitudeView = (TextView)view.findViewById(R.id.target_lon_value);
+		mReceiverLatitudeView  = (TextView)view.findViewById(R.id.receiver_lat_value);
+		mReceiverLongitudeView = (TextView)view.findViewById(R.id.receiver_lon_value);
+		map_offline = (AltosMapOffline)view.findViewById(R.id.map_offline);
+		map_offline.onCreateView(altos_droid.map_type);
+		map_online = new AltosMapOnline(view.getContext());
+		map_online.onCreateView(altos_droid.map_type);
+		set_map_source(AltosDroidPreferences.map_source());
+		return view;
 	}
 
 	@Override
 	public void onActivityCreated(Bundle savedInstanceState) {
 		super.onActivityCreated(savedInstanceState);
-		getChildFragmentManager().beginTransaction().add(R.id.map, mMapFragment).commit();
-	}
-
-	private void setupMap() {
-		mMap = mMapFragment.getMap();
-		if (mMap != null) {
-			set_map_type(altos_droid.map_type);
-			mMap.setMyLocationEnabled(true);
-			mMap.getUiSettings().setTiltGesturesEnabled(false);
-			mMap.getUiSettings().setZoomControlsEnabled(false);
-
-			Bitmap label_bitmap = rocket_bitmap("hello");
-
-			mPadMarker = mMap.addMarker(
-					new MarkerOptions().icon(BitmapDescriptorFactory.fromResource(R.drawable.pad))
-					                   .position(new LatLng(0,0))
-					                   .visible(false)
-					);
-
-			mPolyline = mMap.addPolyline(
-					new PolylineOptions().add(new LatLng(0,0), new LatLng(0,0))
-					                     .width(20)
-					                     .color(Color.BLUE)
-					                     .visible(false)
-					);
-
-			mapLoaded = true;
-		}
+		if (map_online != null)
+			getChildFragmentManager().beginTransaction().add(R.id.map_online, map_online.mMapFragment).commit();
 	}
 
-	private void center(double lat, double lon, double accuracy) {
-		if (mapAccuracy < 0 || accuracy < mapAccuracy/10) {
-			mMap.moveCamera(CameraUpdateFactory.newLatLngZoom(new LatLng(lat, lon),14));
-			mapAccuracy = accuracy;
-		}
+	@Override
+	public void onDestroyView() {
+		super.onDestroyView();
 	}
 
 	public String tab_name() { return "map"; }
 
-	private void set_rocket(int serial, AltosState state) {
-		Marker	marker;
-
-		if (state.gps == null || state.gps.lat == AltosLib.MISSING)
-			return;
-
-		if (rockets.containsKey(serial)) {
-			marker = rockets.get(serial);
-			marker.setPosition(new LatLng(state.gps.lat, state.gps.lon));
-		} else {
-			marker = rocket_marker(serial, state.gps.lat, state.gps.lon);
-			rockets.put(serial, marker);
-			marker.setVisible(true);
-		}
-	}
-
-	private void remove_rocket(int serial) {
-		Marker marker = rockets.get(serial);
-		marker.remove();
-		rockets.remove(serial);
+	private void center(double lat, double lon, double accuracy) {
+		if (map_offline != null)
+			map_offline.center(lat, lon, accuracy);
+		if (map_online != null)
+			map_online.center(lat, lon, accuracy);
 	}
 
 	public void show(TelemetryState telem_state, AltosState state, AltosGreatCircle from_receiver, Location receiver) {
@@ -196,67 +111,59 @@ public class TabMap extends AltosDroidTab {
 			set_value(mDistanceView, AltosConvert.distance, 6, from_receiver.distance);
 		}
 
-		if (telem_state != null) {
-			for (int serial : rockets.keySet()) {
-				if (!telem_state.states.containsKey(serial))
-					remove_rocket(serial);
-			}
-
-			for (int serial : telem_state.states.keySet()) {
-				set_rocket(serial, telem_state.states.get(serial));
-			}
-		}
-
 		if (state != null) {
-			if (mapLoaded) {
-				if (!pad_set && state.pad_lat != AltosLib.MISSING) {
-					pad_set = true;
-					mPadMarker.setPosition(new LatLng(state.pad_lat, state.pad_lon));
-					mPadMarker.setVisible(true);
-				}
-			}
 			if (state.gps != null) {
-
-				target_position = new AltosLatLon(state.gps.lat, state.gps.lon);
-
 				mTargetLatitudeView.setText(AltosDroid.pos(state.gps.lat, "N", "S"));
 				mTargetLongitudeView.setText(AltosDroid.pos(state.gps.lon, "E", "W"));
-				if (state.gps.locked && state.gps.nsat >= 4)
-					center (state.gps.lat, state.gps.lon, 10);
 			}
 		}
 
 		if (receiver != null) {
 			double accuracy;
 
+			here = new AltosLatLon(receiver.getLatitude(), receiver.getLongitude());
 			if (receiver.hasAccuracy())
 				accuracy = receiver.getAccuracy();
 			else
 				accuracy = 1000;
-
-			my_position = new AltosLatLon(receiver.getLatitude(), receiver.getLongitude());
-			mReceiverLatitudeView.setText(AltosDroid.pos(my_position.lat, "N", "S"));
-			mReceiverLongitudeView.setText(AltosDroid.pos(my_position.lon, "E", "W"));
-			center (my_position.lat, my_position.lon, accuracy);
+			mReceiverLatitudeView.setText(AltosDroid.pos(here.lat, "N", "S"));
+			mReceiverLongitudeView.setText(AltosDroid.pos(here.lon, "E", "W"));
+			center (here.lat, here.lon, accuracy);
 		}
-
-		if (my_position != null && target_position != null) {
-			mPolyline.setPoints(Arrays.asList(new LatLng(my_position.lat, my_position.lon), new LatLng(target_position.lat, target_position.lon)));
-			mPolyline.setVisible(true);
+		if (map_source == AltosDroidPreferences.MAP_SOURCE_OFFLINE) {
+			if (map_offline != null)
+				map_offline.show(telem_state, state, from_receiver, receiver);
+		} else {
+			if (map_online != null)
+				map_online.show(telem_state, state, from_receiver, receiver);
 		}
-
 	}
 
+	@Override
 	public void set_map_type(int map_type) {
-		if (mMap != null) {
-			if (map_type == AltosMap.maptype_hybrid)
-				mMap.setMapType(GoogleMap.MAP_TYPE_HYBRID);
-			else if (map_type == AltosMap.maptype_satellite)
-				mMap.setMapType(GoogleMap.MAP_TYPE_SATELLITE);
-			else if (map_type == AltosMap.maptype_terrain)
-				mMap.setMapType(GoogleMap.MAP_TYPE_TERRAIN);
-			else
-				mMap.setMapType(GoogleMap.MAP_TYPE_NORMAL);
+		if (map_offline != null)
+			map_offline.set_map_type(map_type);
+		if (map_online != null)
+			map_online.set_map_type(map_type);
+	}
+
+	@Override
+	public void set_map_source(int map_source) {
+		this.map_source = map_source;
+		if (map_source == AltosDroidPreferences.MAP_SOURCE_OFFLINE) {
+			if (map_online != null)
+				map_online.set_visible(false);
+			if (map_offline != null) {
+				map_offline.set_visible(true);
+				map_offline.show(last_telem_state, last_state, last_from_receiver, last_receiver);
+			}
+		} else {
+			if (map_offline != null)
+				map_offline.set_visible(false);
+			if (map_online != null) {
+				map_online.set_visible(true);
+				map_online.show(last_telem_state, last_state, last_from_receiver, last_receiver);
+			}
 		}
 	}
 
diff --git a/altosdroid/src/org/altusmetrum/AltosDroid/TabMapOffline.java b/altosdroid/src/org/altusmetrum/AltosDroid/TabMapOffline.java
deleted file mode 100644
index 26e04c83..00000000
--- a/altosdroid/src/org/altusmetrum/AltosDroid/TabMapOffline.java
+++ /dev/null
@@ -1,172 +0,0 @@
-/*
- * Copyright © 2013 Mike Beattie <mike@ethernal.org>
- *
- * 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.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
- */
-
-package org.altusmetrum.AltosDroid;
-
-import java.util.*;
-import java.io.*;
-
-import org.altusmetrum.altoslib_7.*;
-
-import android.app.Activity;
-import android.graphics.*;
-import android.os.Bundle;
-import android.support.v4.app.Fragment;
-import android.support.v4.app.FragmentTransaction;
-import android.view.*;
-import android.widget.*;
-import android.location.Location;
-import android.content.*;
-
-public class TabMapOffline extends AltosDroidTab {
-
-	AltosLatLon	here;
-
-	private TextView mDistanceView;
-	private TextView mBearingView;
-	private TextView mTargetLatitudeView;
-	private TextView mTargetLongitudeView;
-	private TextView mReceiverLatitudeView;
-	private TextView mReceiverLongitudeView;
-	private AltosMapOffline map_offline;
-	private AltosMapOnline map_online;
-	private View view;
-	private int map_source;
-
-	@Override
-	public void onAttach(Activity activity) {
-		super.onAttach(activity);
-	}
-
-	@Override
-	public void onCreate(Bundle savedInstanceState) {
-		super.onCreate(savedInstanceState);
-	}
-
-	private void make_offline_map() {
-	}
-
-	private void make_online_map() {
-		map_online = new AltosMapOnline(view.getContext());
-		map_online.onCreateView(altos_droid.map_type);
-	}
-
-	@Override
-	public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
-		view = inflater.inflate(R.layout.tab_map_offline, container, false);
-		int map_source = AltosDroidPreferences.map_source();
-
-		mDistanceView  = (TextView)view.findViewById(R.id.distance_value_offline);
-		mBearingView   = (TextView)view.findViewById(R.id.bearing_value_offline);
-		mTargetLatitudeView  = (TextView)view.findViewById(R.id.target_lat_value_offline);
-		mTargetLongitudeView = (TextView)view.findViewById(R.id.target_lon_value_offline);
-		mReceiverLatitudeView  = (TextView)view.findViewById(R.id.receiver_lat_value_offline);
-		mReceiverLongitudeView = (TextView)view.findViewById(R.id.receiver_lon_value_offline);
-		map_offline = (AltosMapOffline)view.findViewById(R.id.map_view_offline);
-		map_offline.onCreateView(altos_droid.map_type);
-		map_online = new AltosMapOnline(view.getContext());
-		map_online.onCreateView(altos_droid.map_type);
-		set_map_source(AltosDroidPreferences.map_source());
-		return view;
-	}
-
-	@Override
-	public void onActivityCreated(Bundle savedInstanceState) {
-		super.onActivityCreated(savedInstanceState);
-		if (map_online != null)
-			getChildFragmentManager().beginTransaction().add(R.id.map_online, map_online.mMapFragment).commit();
-	}
-
-	@Override
-	public void onDestroyView() {
-		super.onDestroyView();
-	}
-
-	public String tab_name() { return "offmap"; }
-
-	private void center(double lat, double lon, double accuracy) {
-		if (map_offline != null)
-			map_offline.center(lat, lon, accuracy);
-		if (map_online != null)
-			map_online.center(lat, lon, accuracy);
-	}
-
-	public void show(TelemetryState telem_state, AltosState state, AltosGreatCircle from_receiver, Location receiver) {
-		if (from_receiver != null) {
-			mBearingView.setText(String.format("%3.0f°", from_receiver.bearing));
-			set_value(mDistanceView, AltosConvert.distance, 6, from_receiver.distance);
-		}
-
-		if (state != null) {
-			if (state.gps != null) {
-				mTargetLatitudeView.setText(AltosDroid.pos(state.gps.lat, "N", "S"));
-				mTargetLongitudeView.setText(AltosDroid.pos(state.gps.lon, "E", "W"));
-			}
-		}
-
-		if (receiver != null) {
-			double accuracy;
-
-			here = new AltosLatLon(receiver.getLatitude(), receiver.getLongitude());
-			if (receiver.hasAccuracy())
-				accuracy = receiver.getAccuracy();
-			else
-				accuracy = 1000;
-			mReceiverLatitudeView.setText(AltosDroid.pos(here.lat, "N", "S"));
-			mReceiverLongitudeView.setText(AltosDroid.pos(here.lon, "E", "W"));
-			center (here.lat, here.lon, accuracy);
-		}
-		if (map_source == AltosDroidPreferences.MAP_SOURCE_OFFLINE) {
-			if (map_offline != null)
-				map_offline.show(telem_state, state, from_receiver, receiver);
-		} else {
-			if (map_online != null)
-				map_online.show(telem_state, state, from_receiver, receiver);
-		}
-	}
-
-	@Override
-	public void set_map_type(int map_type) {
-		if (map_offline != null)
-			map_offline.set_map_type(map_type);
-		if (map_online != null)
-			map_online.set_map_type(map_type);
-	}
-
-	@Override
-	public void set_map_source(int map_source) {
-		this.map_source = map_source;
-		if (map_source == AltosDroidPreferences.MAP_SOURCE_OFFLINE) {
-			if (map_online != null)
-				map_online.set_visible(false);
-			if (map_offline != null) {
-				map_offline.set_visible(true);
-				map_offline.show(last_telem_state, last_state, last_from_receiver, last_receiver);
-			}
-		} else {
-			if (map_offline != null)
-				map_offline.set_visible(false);
-			if (map_online != null) {
-				map_online.set_visible(true);
-				map_online.show(last_telem_state, last_state, last_from_receiver, last_receiver);
-			}
-		}
-	}
-
-	public TabMapOffline() {
-	}
-}
-- 
cgit v1.2.3


From 2b6768ed32d7be444c49caa40d30b520177bb22a Mon Sep 17 00:00:00 2001
From: Keith Packard <keithp@keithp.com>
Date: Mon, 22 Jun 2015 20:43:23 -0700
Subject: altosdroid: Switch to four tabs (pad/flight/recover/map)

Ascent and descent were almost the same; no reason to have both.

Signed-off-by: Keith Packard <keithp@keithp.com>
---
 altosdroid/res/layout/tab_ascent.xml               | 299 ----------------
 altosdroid/res/layout/tab_descent.xml              | 339 ------------------
 altosdroid/res/layout/tab_flight.xml               | 391 +++++++++++++++++++++
 altosdroid/res/layout/tab_landed.xml               | 211 -----------
 altosdroid/res/layout/tab_recover.xml              | 211 +++++++++++
 .../src/org/altusmetrum/AltosDroid/AltosDroid.java |  18 +-
 .../altusmetrum/AltosDroid/PreloadMapActivity.java |   3 +
 .../src/org/altusmetrum/AltosDroid/TabAscent.java  | 101 ------
 .../src/org/altusmetrum/AltosDroid/TabDescent.java | 106 ------
 .../src/org/altusmetrum/AltosDroid/TabFlight.java  | 134 +++++++
 .../src/org/altusmetrum/AltosDroid/TabLanded.java  |  82 -----
 .../src/org/altusmetrum/AltosDroid/TabRecover.java |  82 +++++
 12 files changed, 828 insertions(+), 1149 deletions(-)
 delete mode 100644 altosdroid/res/layout/tab_ascent.xml
 delete mode 100644 altosdroid/res/layout/tab_descent.xml
 create mode 100644 altosdroid/res/layout/tab_flight.xml
 delete mode 100644 altosdroid/res/layout/tab_landed.xml
 create mode 100644 altosdroid/res/layout/tab_recover.xml
 delete mode 100644 altosdroid/src/org/altusmetrum/AltosDroid/TabAscent.java
 delete mode 100644 altosdroid/src/org/altusmetrum/AltosDroid/TabDescent.java
 create mode 100644 altosdroid/src/org/altusmetrum/AltosDroid/TabFlight.java
 delete mode 100644 altosdroid/src/org/altusmetrum/AltosDroid/TabLanded.java
 create mode 100644 altosdroid/src/org/altusmetrum/AltosDroid/TabRecover.java

(limited to 'altosdroid/res')

diff --git a/altosdroid/res/layout/tab_ascent.xml b/altosdroid/res/layout/tab_ascent.xml
deleted file mode 100644
index b21ec426..00000000
--- a/altosdroid/res/layout/tab_ascent.xml
+++ /dev/null
@@ -1,299 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-     Copyright © 2013 Mike Beattie <mike@ethernal.org>
-
-     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.
-
-     This program is distributed in the hope that it will be useful, but
-     WITHOUT ANY WARRANTY; without even the implied warranty of
-     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-     General Public License for more details.
-
-     You should have received a copy of the GNU General Public License along
-     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: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"
-		android:paddingTop="5dp" >
-
-		<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>
-
-		<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/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/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>
-	</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/accel_label"
-				android:layout_width="wrap_content"
-				android:layout_height="wrap_content"
-				android:text="@string/accel_label" />
-
-			<TextView
-				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: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_accel_label"
-				android:layout_width="wrap_content"
-				android:layout_height="wrap_content"
-				android:text="@string/max_accel_label" />
-
-			<TextView
-				android:id="@+id/max_accel_value"
-				android:layout_width="wrap_content"
-				android:layout_height="wrap_content"
-				android:layout_alignParentRight="true"
-				android:layout_below="@id/max_accel_label"
-				android:text=""
-				android:textAppearance="?android:attr/textAppearanceSmall" />
-		</RelativeLayout>
-	</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>
-
-</LinearLayout>
\ No newline at end of file
diff --git a/altosdroid/res/layout/tab_descent.xml b/altosdroid/res/layout/tab_descent.xml
deleted file mode 100644
index 9e1fc820..00000000
--- a/altosdroid/res/layout/tab_descent.xml
+++ /dev/null
@@ -1,339 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-     Copyright © 2013 Mike Beattie <mike@ethernal.org>
-
-     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.
-
-     This program is distributed in the hope that it will be useful, but
-     WITHOUT ANY WARRANTY; without even the implied warranty of
-     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-     General Public License for more details.
-
-     You should have received a copy of the GNU General Public License along
-     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: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"
-		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>
-
-</LinearLayout>
diff --git a/altosdroid/res/layout/tab_flight.xml b/altosdroid/res/layout/tab_flight.xml
new file mode 100644
index 00000000..4fa026ca
--- /dev/null
+++ b/altosdroid/res/layout/tab_flight.xml
@@ -0,0 +1,391 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright © 2013 Mike Beattie <mike@ethernal.org>
+
+     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.
+
+     This program is distributed in the hope that it will be useful, but
+     WITHOUT ANY WARRANTY; without even the implied warranty of
+     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+     General Public License for more details.
+
+     You should have received a copy of the GNU General Public License along
+     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: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>
+
+</LinearLayout>
diff --git a/altosdroid/res/layout/tab_landed.xml b/altosdroid/res/layout/tab_landed.xml
deleted file mode 100644
index f27baa9e..00000000
--- a/altosdroid/res/layout/tab_landed.xml
+++ /dev/null
@@ -1,211 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-     Copyright © 2013 Mike Beattie <mike@ethernal.org>
-
-     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.
-
-     This program is distributed in the hope that it will be useful, but
-     WITHOUT ANY WARRANTY; without even the implied warranty of
-     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-     General Public License for more details.
-
-     You should have received a copy of the GNU General Public License along
-     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:orientation="vertical" >
-
-	<RelativeLayout
-		android:layout_width="wrap_content"
-		android:layout_height="wrap_content" >
-
-		<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="wrap_content"
-		android:layout_height="wrap_content"
-		android:paddingTop="5dp" >
-
-		<TextView
-			android:id="@+id/distance_label"
-			android:layout_width="wrap_content"
-			android:layout_height="wrap_content"
-			android:text="@string/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>
-
-	<RelativeLayout
-		android:layout_width="wrap_content"
-		android:layout_height="wrap_content"
-		android:paddingTop="5dp" >
-
-		<TextView
-			android:id="@+id/target_lat_label"
-			android:layout_width="wrap_content"
-			android:layout_height="wrap_content"
-			android:text="@string/target_latitude_label" />
-
-		<TextView
-			android:id="@+id/target_lat_value"
-			android:layout_width="wrap_content"
-			android:layout_height="wrap_content"
-			android:layout_alignParentRight="true"
-			android:layout_below="@id/target_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/target_lon_label"
-			android:layout_width="wrap_content"
-			android:layout_height="wrap_content"
-			android:text="@string/target_longitude_label" />
-
-		<TextView
-			android:id="@+id/target_lon_value"
-			android:layout_width="wrap_content"
-			android:layout_height="wrap_content"
-			android:layout_alignParentRight="true"
-			android:layout_below="@id/target_lon_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/receiver_lat_label"
-			android:layout_width="wrap_content"
-			android:layout_height="wrap_content"
-			android:text="@string/receiver_latitude_label" />
-
-		<TextView
-			android:id="@+id/receiver_lat_value"
-			android:layout_width="wrap_content"
-			android:layout_height="wrap_content"
-			android:layout_alignParentRight="true"
-			android:layout_below="@id/receiver_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/receiver_lon_label"
-			android:layout_width="wrap_content"
-			android:layout_height="wrap_content"
-			android:text="@string/receiver_longitude_label" />
-
-		<TextView
-			android:id="@+id/receiver_lon_value"
-			android:layout_width="wrap_content"
-			android:layout_height="wrap_content"
-			android:layout_alignParentRight="true"
-			android:layout_below="@id/receiver_lon_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/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>
-
-	<RelativeLayout
-		android:layout_width="wrap_content"
-		android:layout_height="wrap_content"
-		android:paddingTop="5dp" >
-
-		<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="wrap_content"
-		android:layout_height="wrap_content"
-		android:paddingTop="5dp" >
-
-		<TextView
-			android:id="@+id/max_accel_label"
-			android:layout_width="wrap_content"
-			android:layout_height="wrap_content"
-			android:text="@string/max_accel_label" />
-
-		<TextView
-			android:id="@+id/max_accel_value"
-			android:layout_width="wrap_content"
-			android:layout_height="wrap_content"
-			android:layout_alignParentRight="true"
-			android:layout_below="@id/max_accel_label"
-			android:text=""
-			android:textAppearance="?android:attr/textAppearanceSmall" />
-	</RelativeLayout>
-
-</LinearLayout>
\ No newline at end of file
diff --git a/altosdroid/res/layout/tab_recover.xml b/altosdroid/res/layout/tab_recover.xml
new file mode 100644
index 00000000..f27baa9e
--- /dev/null
+++ b/altosdroid/res/layout/tab_recover.xml
@@ -0,0 +1,211 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright © 2013 Mike Beattie <mike@ethernal.org>
+
+     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.
+
+     This program is distributed in the hope that it will be useful, but
+     WITHOUT ANY WARRANTY; without even the implied warranty of
+     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+     General Public License for more details.
+
+     You should have received a copy of the GNU General Public License along
+     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:orientation="vertical" >
+
+	<RelativeLayout
+		android:layout_width="wrap_content"
+		android:layout_height="wrap_content" >
+
+		<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="wrap_content"
+		android:layout_height="wrap_content"
+		android:paddingTop="5dp" >
+
+		<TextView
+			android:id="@+id/distance_label"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:text="@string/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>
+
+	<RelativeLayout
+		android:layout_width="wrap_content"
+		android:layout_height="wrap_content"
+		android:paddingTop="5dp" >
+
+		<TextView
+			android:id="@+id/target_lat_label"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:text="@string/target_latitude_label" />
+
+		<TextView
+			android:id="@+id/target_lat_value"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:layout_alignParentRight="true"
+			android:layout_below="@id/target_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/target_lon_label"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:text="@string/target_longitude_label" />
+
+		<TextView
+			android:id="@+id/target_lon_value"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:layout_alignParentRight="true"
+			android:layout_below="@id/target_lon_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/receiver_lat_label"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:text="@string/receiver_latitude_label" />
+
+		<TextView
+			android:id="@+id/receiver_lat_value"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:layout_alignParentRight="true"
+			android:layout_below="@id/receiver_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/receiver_lon_label"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:text="@string/receiver_longitude_label" />
+
+		<TextView
+			android:id="@+id/receiver_lon_value"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:layout_alignParentRight="true"
+			android:layout_below="@id/receiver_lon_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/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>
+
+	<RelativeLayout
+		android:layout_width="wrap_content"
+		android:layout_height="wrap_content"
+		android:paddingTop="5dp" >
+
+		<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="wrap_content"
+		android:layout_height="wrap_content"
+		android:paddingTop="5dp" >
+
+		<TextView
+			android:id="@+id/max_accel_label"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:text="@string/max_accel_label" />
+
+		<TextView
+			android:id="@+id/max_accel_value"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:layout_alignParentRight="true"
+			android:layout_below="@id/max_accel_label"
+			android:text=""
+			android:textAppearance="?android:attr/textAppearanceSmall" />
+	</RelativeLayout>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java b/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java
index c5da6d0e..6cd9463a 100644
--- a/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java
+++ b/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java
@@ -399,9 +399,9 @@ public class AltosDroid extends FragmentActivity implements AltosUnitsListener {
 				if (prev_locked != locked) {
 					String currentTab = mTabHost.getCurrentTabTag();
 					if (locked) {
-						if (currentTab.equals("pad")) mTabHost.setCurrentTabByTag("descent");
+						if (currentTab.equals("pad")) mTabHost.setCurrentTabByTag("flight");
 					} else {
-						if (currentTab.equals("descent")) mTabHost.setCurrentTabByTag("pad");
+						if (currentTab.equals("flight")) mTabHost.setCurrentTabByTag("pad");
 					}
 				}
 			} else {
@@ -409,16 +409,13 @@ public class AltosDroid extends FragmentActivity implements AltosUnitsListener {
 					String currentTab = mTabHost.getCurrentTabTag();
 					switch (state.state) {
 					case AltosLib.ao_flight_boost:
-						if (currentTab.equals("pad")) mTabHost.setCurrentTabByTag("ascent");
-						break;
-					case AltosLib.ao_flight_drogue:
-						if (currentTab.equals("ascent")) mTabHost.setCurrentTabByTag("descent");
+						if (currentTab.equals("pad")) mTabHost.setCurrentTabByTag("flight");
 						break;
 					case AltosLib.ao_flight_landed:
-						if (currentTab.equals("descent")) mTabHost.setCurrentTabByTag("landed");
+						if (currentTab.equals("flight")) mTabHost.setCurrentTabByTag("recover");
 						break;
 					case AltosLib.ao_flight_stateless:
-						if (currentTab.equals("pad")) mTabHost.setCurrentTabByTag("descent");
+						if (currentTab.equals("pad")) mTabHost.setCurrentTabByTag("flight");
 						break;
 					}
 				}
@@ -539,9 +536,8 @@ public class AltosDroid extends FragmentActivity implements AltosUnitsListener {
 		mTabsAdapter = new TabsAdapter(this, mTabHost, mViewPager);
 
 		mTabsAdapter.addTab(mTabHost.newTabSpec("pad").setIndicator(create_tab_view("Pad")), TabPad.class, null);
-		mTabsAdapter.addTab(mTabHost.newTabSpec("ascent").setIndicator(create_tab_view("Ascent")), TabAscent.class, null);
-		mTabsAdapter.addTab(mTabHost.newTabSpec("descent").setIndicator(create_tab_view("Descent")), TabDescent.class, null);
-		mTabsAdapter.addTab(mTabHost.newTabSpec("landed").setIndicator(create_tab_view("Landed")), TabLanded.class, null);
+		mTabsAdapter.addTab(mTabHost.newTabSpec("flight").setIndicator(create_tab_view("Flight")), TabFlight.class, null);
+		mTabsAdapter.addTab(mTabHost.newTabSpec("recover").setIndicator(create_tab_view("Recover")), TabRecover.class, null);
 		mTabsAdapter.addTab(mTabHost.newTabSpec("map").setIndicator(create_tab_view("Map")), TabMap.class, null);
 
 		// Display the Version
diff --git a/altosdroid/src/org/altusmetrum/AltosDroid/PreloadMapActivity.java b/altosdroid/src/org/altusmetrum/AltosDroid/PreloadMapActivity.java
index 2f2f74ce..1968edae 100644
--- a/altosdroid/src/org/altusmetrum/AltosDroid/PreloadMapActivity.java
+++ b/altosdroid/src/org/altusmetrum/AltosDroid/PreloadMapActivity.java
@@ -163,6 +163,9 @@ public class PreloadMapActivity extends Activity implements AltosLaunchSiteListe
 	public void set_zoom_label(String label) {
 	}
 
+	public void select_object(AltosLatLon latlon) {
+	}
+
 	public void debug(String format, Object ... arguments) {
 		AltosDebug.debug(format, arguments);
 	}
diff --git a/altosdroid/src/org/altusmetrum/AltosDroid/TabAscent.java b/altosdroid/src/org/altusmetrum/AltosDroid/TabAscent.java
deleted file mode 100644
index afce937f..00000000
--- a/altosdroid/src/org/altusmetrum/AltosDroid/TabAscent.java
+++ /dev/null
@@ -1,101 +0,0 @@
-/*
- * Copyright © 2013 Mike Beattie <mike@ethernal.org>
- *
- * 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.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
- */
-
-package org.altusmetrum.AltosDroid;
-
-import org.altusmetrum.altoslib_7.*;
-
-import android.app.Activity;
-import android.os.Bundle;
-import android.support.v4.app.Fragment;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.ImageView;
-import android.widget.TextView;
-import android.location.Location;
-
-public class TabAscent extends AltosDroidTab {
-	private TextView mHeightView;
-	private TextView mMaxHeightView;
-	private TextView mSpeedView;
-	private TextView mMaxSpeedView;
-	private TextView mAccelView;
-	private TextView mMaxAccelView;
-	private TextView mLatitudeView;
-	private TextView mLongitudeView;
-	private TextView mApogeeVoltageView;
-	private GoNoGoLights mApogeeLights;
-	private TextView mMainVoltageView;
-	private GoNoGoLights mMainLights;
-
-	@Override
-	public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
-		View v = inflater.inflate(R.layout.tab_ascent, container, false);
-
-		mHeightView    = (TextView) v.findViewById(R.id.height_value);
-		mMaxHeightView = (TextView) v.findViewById(R.id.max_height_value);
-		mSpeedView     = (TextView) v.findViewById(R.id.speed_value);
-		mMaxSpeedView  = (TextView) v.findViewById(R.id.max_speed_value);
-		mAccelView     = (TextView) v.findViewById(R.id.accel_value);
-		mMaxAccelView  = (TextView) v.findViewById(R.id.max_accel_value);
-		mLatitudeView  = (TextView) v.findViewById(R.id.lat_value);
-		mLongitudeView = (TextView) v.findViewById(R.id.lon_value);
-
-		mApogeeVoltageView = (TextView) v.findViewById(R.id.apogee_voltage_value);
-		mApogeeLights = new GoNoGoLights((ImageView) v.findViewById(R.id.apogee_redled),
-		                                 (ImageView) v.findViewById(R.id.apogee_greenled),
-		                                 getResources());
-
-		mMainVoltageView = (TextView) v.findViewById(R.id.main_voltage_value);
-		mMainLights = new GoNoGoLights((ImageView) v.findViewById(R.id.main_redled),
-		                               (ImageView) v.findViewById(R.id.main_greenled),
-		                               getResources());
-
-		return v;
-	}
-
-	public String tab_name() {
-		return "ascent";
-	}
-
-	public void show(TelemetryState telem_state, AltosState state, AltosGreatCircle from_receiver, Location receiver) {
-		if (state != null) {
-			set_value(mHeightView, AltosConvert.height, 6, state.height());
-			set_value(mHeightView, AltosConvert.height, 6, state.height());
-			set_value(mMaxHeightView, AltosConvert.height, 6, state.max_height());
-			set_value(mSpeedView, AltosConvert.speed, 6, state.speed());
-			set_value(mMaxSpeedView, AltosConvert.speed, 6, state.max_speed());
-			set_value(mAccelView, AltosConvert.accel, 6, state.acceleration());
-			set_value(mMaxAccelView, AltosConvert.accel, 6, state.max_acceleration());
-
-			if (state.gps != null) {
-				mLatitudeView.setText(AltosDroid.pos(state.gps.lat, "N", "S"));
-				mLongitudeView.setText(AltosDroid.pos(state.gps.lon, "E", "W"));
-			} else {
-				mLatitudeView.setText("");
-				mLongitudeView.setText("");
-			}
-
-			mApogeeVoltageView.setText(AltosDroid.number("%4.2f V", state.apogee_voltage));
-			mApogeeLights.set(state.apogee_voltage > 3.2, state.apogee_voltage == AltosLib.MISSING);
-
-			mMainVoltageView.setText(AltosDroid.number("%4.2f V", state.main_voltage));
-			mMainLights.set(state.main_voltage > 3.2, state.main_voltage == AltosLib.MISSING);
-		}
-	}
-}
diff --git a/altosdroid/src/org/altusmetrum/AltosDroid/TabDescent.java b/altosdroid/src/org/altusmetrum/AltosDroid/TabDescent.java
deleted file mode 100644
index 3429ee72..00000000
--- a/altosdroid/src/org/altusmetrum/AltosDroid/TabDescent.java
+++ /dev/null
@@ -1,106 +0,0 @@
-/*
- * Copyright © 2013 Mike Beattie <mike@ethernal.org>
- *
- * 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.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
- */
-
-package org.altusmetrum.AltosDroid;
-
-import org.altusmetrum.altoslib_7.*;
-
-import android.app.Activity;
-import android.os.Bundle;
-import android.support.v4.app.Fragment;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.ImageView;
-import android.widget.TextView;
-import android.location.Location;
-
-public class TabDescent extends AltosDroidTab {
-	private TextView mSpeedView;
-	private TextView mHeightView;
-	private TextView mElevationView;
-	private TextView mRangeView;
-	private TextView mBearingView;
-	private TextView mCompassView;
-	private TextView mDistanceView;
-	private TextView mLatitudeView;
-	private TextView mLongitudeView;
-	private TextView mApogeeVoltageView;
-	private GoNoGoLights mApogeeLights;
-	private TextView mMainVoltageView;
-	private GoNoGoLights mMainLights;
-
-	@Override
-	public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
-		View v = inflater.inflate(R.layout.tab_descent, container, false);
-
-		mSpeedView     = (TextView) v.findViewById(R.id.speed_value);
-		mHeightView    = (TextView) v.findViewById(R.id.height_value);
-		mElevationView = (TextView) v.findViewById(R.id.elevation_value);
-		mRangeView     = (TextView) v.findViewById(R.id.range_value);
-		mBearingView   = (TextView) v.findViewById(R.id.bearing_value);
-		mCompassView   = (TextView) v.findViewById(R.id.compass_value);
-		mDistanceView  = (TextView) v.findViewById(R.id.distance_value);
-		mLatitudeView  = (TextView) v.findViewById(R.id.lat_value);
-		mLongitudeView = (TextView) v.findViewById(R.id.lon_value);
-
-		mApogeeVoltageView = (TextView) v.findViewById(R.id.apogee_voltage_value);
-		mApogeeLights = new GoNoGoLights((ImageView) v.findViewById(R.id.apogee_redled),
-		                                 (ImageView) v.findViewById(R.id.apogee_greenled),
-		                                 getResources());
-
-		mMainVoltageView = (TextView) v.findViewById(R.id.main_voltage_value);
-		mMainLights = new GoNoGoLights((ImageView) v.findViewById(R.id.main_redled),
-		                               (ImageView) v.findViewById(R.id.main_greenled),
-		                               getResources());
-
-		return v;
-	}
-
-	public String tab_name() { return "descent"; }
-
-	public void show(TelemetryState telem_state, AltosState state, AltosGreatCircle from_receiver, Location receiver) {
-		if (state != null) {
-			set_value(mSpeedView, AltosConvert.speed, 6, state.speed());
-			set_value(mHeightView, AltosConvert.height, 6, state.height());
-			if (from_receiver != null) {
-				mElevationView.setText(AltosDroid.number("%3.0f°", from_receiver.elevation));
-				set_value(mRangeView, AltosConvert.distance, 6, from_receiver.range);
-				mBearingView.setText(AltosDroid.number("%3.0f°", from_receiver.bearing));
-				mCompassView.setText(from_receiver.bearing_words(AltosGreatCircle.BEARING_LONG));
-				set_value(mDistanceView, AltosConvert.distance, 6, from_receiver.distance);
-			} else { 
-				mElevationView.setText("<unknown>");
-				mRangeView.setText("<unknown>");
-				mBearingView.setText("<unknown>");
-				mCompassView.setText("<unknown>");
-				mDistanceView.setText("<unknown>");
-			}
-			if (state.gps != null) {
-				mLatitudeView.setText(AltosDroid.pos(state.gps.lat, "N", "S"));
-				mLongitudeView.setText(AltosDroid.pos(state.gps.lon, "E", "W"));
-			}
-
-			mApogeeVoltageView.setText(AltosDroid.number("%4.2f V", state.apogee_voltage));
-			mApogeeLights.set(state.apogee_voltage > 3.2, state.apogee_voltage == AltosLib.MISSING);
-
-			mMainVoltageView.setText(AltosDroid.number("%4.2f V", state.main_voltage));
-			mMainLights.set(state.main_voltage > 3.2, state.main_voltage == AltosLib.MISSING);
-		}
-	}
-
-}
diff --git a/altosdroid/src/org/altusmetrum/AltosDroid/TabFlight.java b/altosdroid/src/org/altusmetrum/AltosDroid/TabFlight.java
new file mode 100644
index 00000000..e1fc737d
--- /dev/null
+++ b/altosdroid/src/org/altusmetrum/AltosDroid/TabFlight.java
@@ -0,0 +1,134 @@
+/*
+ * Copyright © 2013 Mike Beattie <mike@ethernal.org>
+ *
+ * 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.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+ */
+
+package org.altusmetrum.AltosDroid;
+
+import org.altusmetrum.altoslib_7.*;
+
+import android.app.Activity;
+import android.os.Bundle;
+import android.support.v4.app.Fragment;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.ImageView;
+import android.widget.TextView;
+import android.location.Location;
+
+public class TabFlight extends AltosDroidTab {
+	private TextView speed_view;
+	private TextView height_view;
+	private TextView max_speed_view;
+	private TextView max_height_view;
+	private TextView elevation_view;
+	private TextView range_view;
+	private TextView bearing_view;
+	private TextView compass_view;
+	private TextView distance_view;
+	private TextView latitude_view;
+	private TextView longitude_view;
+	private TextView apogee_voltage_view;
+	private TextView apogee_voltage_label;
+	private GoNoGoLights apogee_lights;
+	private TextView main_voltage_view;
+	private TextView main_voltage_label;
+	private GoNoGoLights main_lights;
+
+	@Override
+	public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
+		View v = inflater.inflate(R.layout.tab_flight, container, false);
+
+		speed_view     = (TextView) v.findViewById(R.id.speed_value);
+		height_view    = (TextView) v.findViewById(R.id.height_value);
+		max_speed_view = (TextView) v.findViewById(R.id.max_speed_value);
+		max_height_view= (TextView) v.findViewById(R.id.max_height_value);
+		elevation_view = (TextView) v.findViewById(R.id.elevation_value);
+		range_view     = (TextView) v.findViewById(R.id.range_value);
+		bearing_view   = (TextView) v.findViewById(R.id.bearing_value);
+		compass_view   = (TextView) v.findViewById(R.id.compass_value);
+		distance_view  = (TextView) v.findViewById(R.id.distance_value);
+		latitude_view  = (TextView) v.findViewById(R.id.lat_value);
+		longitude_view = (TextView) v.findViewById(R.id.lon_value);
+
+		apogee_voltage_view = (TextView) v.findViewById(R.id.apogee_voltage_value);
+		apogee_lights = new GoNoGoLights((ImageView) v.findViewById(R.id.apogee_redled),
+		                                 (ImageView) v.findViewById(R.id.apogee_greenled),
+		                                 getResources());
+		apogee_voltage_label = (TextView) v.findViewById(R.id.apogee_voltage_label);
+
+		main_voltage_view = (TextView) v.findViewById(R.id.main_voltage_value);
+		main_lights = new GoNoGoLights((ImageView) v.findViewById(R.id.main_redled),
+		                               (ImageView) v.findViewById(R.id.main_greenled),
+		                               getResources());
+		main_voltage_label = (TextView) v.findViewById(R.id.main_voltage_label);
+
+		return v;
+	}
+
+	public String tab_name() { return "flight"; }
+
+	public void show(TelemetryState telem_state, AltosState state, AltosGreatCircle from_receiver, Location receiver) {
+		if (state != null) {
+			set_value(speed_view, AltosConvert.speed, 6, state.speed());
+			set_value(height_view, AltosConvert.height, 6, state.height());
+			set_value(max_speed_view, AltosConvert.speed, 6, state.max_speed());
+			set_value(max_height_view, AltosConvert.speed, 6, state.max_height());
+			if (from_receiver != null) {
+				elevation_view.setText(AltosDroid.number("%3.0f°", from_receiver.elevation));
+				set_value(range_view, AltosConvert.distance, 6, from_receiver.range);
+				bearing_view.setText(AltosDroid.number("%3.0f°", from_receiver.bearing));
+				compass_view.setText(from_receiver.bearing_words(AltosGreatCircle.BEARING_LONG));
+				set_value(distance_view, AltosConvert.distance, 6, from_receiver.distance);
+			} else { 
+				elevation_view.setText("<unknown>");
+				range_view.setText("<unknown>");
+				bearing_view.setText("<unknown>");
+				compass_view.setText("<unknown>");
+				distance_view.setText("<unknown>");
+			}
+			if (state.gps != null) {
+				latitude_view.setText(AltosDroid.pos(state.gps.lat, "N", "S"));
+				longitude_view.setText(AltosDroid.pos(state.gps.lon, "E", "W"));
+			}
+
+			if (state.apogee_voltage == AltosLib.MISSING) {
+				apogee_voltage_view.setVisibility(View.GONE);
+				apogee_voltage_label.setVisibility(View.GONE);
+				apogee_lights.hide();
+			} else {
+				apogee_voltage_view.setText(AltosDroid.number("%4.2f V", state.apogee_voltage));
+				apogee_voltage_view.setVisibility(View.VISIBLE);
+				apogee_voltage_label.setVisibility(View.VISIBLE);
+				apogee_lights.set(state.apogee_voltage > 3.2, state.apogee_voltage == AltosLib.MISSING);
+				apogee_lights.show();
+			}
+
+			if (state.main_voltage == AltosLib.MISSING) {
+				main_voltage_view.setVisibility(View.GONE);
+				main_voltage_label.setVisibility(View.GONE);
+				main_lights.hide();
+			} else {
+				main_voltage_view.setText(AltosDroid.number("%4.2f V", state.main_voltage));
+				main_voltage_view.setVisibility(View.VISIBLE);
+				main_voltage_label.setVisibility(View.VISIBLE);
+				main_lights.set(state.main_voltage > 3.2, state.main_voltage == AltosLib.MISSING);
+				main_lights.show();
+			}
+		}
+	}
+
+}
diff --git a/altosdroid/src/org/altusmetrum/AltosDroid/TabLanded.java b/altosdroid/src/org/altusmetrum/AltosDroid/TabLanded.java
deleted file mode 100644
index dd3f938e..00000000
--- a/altosdroid/src/org/altusmetrum/AltosDroid/TabLanded.java
+++ /dev/null
@@ -1,82 +0,0 @@
-/*
- * Copyright © 2013 Mike Beattie <mike@ethernal.org>
- *
- * 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.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
- */
-
-package org.altusmetrum.AltosDroid;
-
-import org.altusmetrum.altoslib_7.*;
-
-import android.app.Activity;
-import android.os.Bundle;
-import android.support.v4.app.Fragment;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.TextView;
-import android.location.Location;
-
-public class TabLanded extends AltosDroidTab {
-	private TextView mBearingView;
-	private TextView mDistanceView;
-	private TextView mTargetLatitudeView;
-	private TextView mTargetLongitudeView;
-	private TextView mReceiverLatitudeView;
-	private TextView mReceiverLongitudeView;
-	private TextView mMaxHeightView;
-	private TextView mMaxSpeedView;
-	private TextView mMaxAccelView;
-
-	@Override
-	public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
-		View v = inflater.inflate(R.layout.tab_landed, container, false);
-
-		mBearingView   = (TextView) v.findViewById(R.id.bearing_value);
-		mDistanceView  = (TextView) v.findViewById(R.id.distance_value);
-		mTargetLatitudeView  = (TextView) v.findViewById(R.id.target_lat_value);
-		mTargetLongitudeView = (TextView) v.findViewById(R.id.target_lon_value);
-		mReceiverLatitudeView  = (TextView) v.findViewById(R.id.receiver_lat_value);
-		mReceiverLongitudeView = (TextView) v.findViewById(R.id.receiver_lon_value);
-		mMaxHeightView = (TextView) v.findViewById(R.id.max_height_value);
-		mMaxSpeedView  = (TextView) v.findViewById(R.id.max_speed_value);
-		mMaxAccelView  = (TextView) v.findViewById(R.id.max_accel_value);
-
-		return v;
-	}
-
-	public String tab_name() { return "landed"; }
-
-	public void show(TelemetryState telem_state, AltosState state, AltosGreatCircle from_receiver, Location receiver) {
-		if (from_receiver != null) {
-			mBearingView.setText(String.format("%3.0f°", from_receiver.bearing));
-			set_value(mDistanceView, AltosConvert.distance, 6, from_receiver.distance);
-		}
-		if (state != null && state.gps != null) {
-			mTargetLatitudeView.setText(AltosDroid.pos(state.gps.lat, "N", "S"));
-			mTargetLongitudeView.setText(AltosDroid.pos(state.gps.lon, "E", "W"));
-		}
-
-		if (receiver != null) {
-			mReceiverLatitudeView.setText(AltosDroid.pos(receiver.getLatitude(), "N", "S"));
-			mReceiverLongitudeView.setText(AltosDroid.pos(receiver.getLongitude(), "E", "W"));
-		}
-
-		if (state != null) {
-			set_value(mMaxHeightView, AltosConvert.height, 6, state.max_height());
-			set_value(mMaxAccelView, AltosConvert.accel, 6, state.max_acceleration());
-			set_value(mMaxSpeedView, AltosConvert.speed, 6, state.max_speed());
-		}
-	}
-}
diff --git a/altosdroid/src/org/altusmetrum/AltosDroid/TabRecover.java b/altosdroid/src/org/altusmetrum/AltosDroid/TabRecover.java
new file mode 100644
index 00000000..0ab20f5f
--- /dev/null
+++ b/altosdroid/src/org/altusmetrum/AltosDroid/TabRecover.java
@@ -0,0 +1,82 @@
+/*
+ * Copyright © 2013 Mike Beattie <mike@ethernal.org>
+ *
+ * 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.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+ */
+
+package org.altusmetrum.AltosDroid;
+
+import org.altusmetrum.altoslib_7.*;
+
+import android.app.Activity;
+import android.os.Bundle;
+import android.support.v4.app.Fragment;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.TextView;
+import android.location.Location;
+
+public class TabRecover extends AltosDroidTab {
+	private TextView mBearingView;
+	private TextView mDistanceView;
+	private TextView mTargetLatitudeView;
+	private TextView mTargetLongitudeView;
+	private TextView mReceiverLatitudeView;
+	private TextView mReceiverLongitudeView;
+	private TextView mMaxHeightView;
+	private TextView mMaxSpeedView;
+	private TextView mMaxAccelView;
+
+	@Override
+	public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
+		View v = inflater.inflate(R.layout.tab_recover, container, false);
+
+		mBearingView   = (TextView) v.findViewById(R.id.bearing_value);
+		mDistanceView  = (TextView) v.findViewById(R.id.distance_value);
+		mTargetLatitudeView  = (TextView) v.findViewById(R.id.target_lat_value);
+		mTargetLongitudeView = (TextView) v.findViewById(R.id.target_lon_value);
+		mReceiverLatitudeView  = (TextView) v.findViewById(R.id.receiver_lat_value);
+		mReceiverLongitudeView = (TextView) v.findViewById(R.id.receiver_lon_value);
+		mMaxHeightView = (TextView) v.findViewById(R.id.max_height_value);
+		mMaxSpeedView  = (TextView) v.findViewById(R.id.max_speed_value);
+		mMaxAccelView  = (TextView) v.findViewById(R.id.max_accel_value);
+
+		return v;
+	}
+
+	public String tab_name() { return "recover"; }
+
+	public void show(TelemetryState telem_state, AltosState state, AltosGreatCircle from_receiver, Location receiver) {
+		if (from_receiver != null) {
+			mBearingView.setText(String.format("%3.0f°", from_receiver.bearing));
+			set_value(mDistanceView, AltosConvert.distance, 6, from_receiver.distance);
+		}
+		if (state != null && state.gps != null) {
+			mTargetLatitudeView.setText(AltosDroid.pos(state.gps.lat, "N", "S"));
+			mTargetLongitudeView.setText(AltosDroid.pos(state.gps.lon, "E", "W"));
+		}
+
+		if (receiver != null) {
+			mReceiverLatitudeView.setText(AltosDroid.pos(receiver.getLatitude(), "N", "S"));
+			mReceiverLongitudeView.setText(AltosDroid.pos(receiver.getLongitude(), "E", "W"));
+		}
+
+		if (state != null) {
+			set_value(mMaxHeightView, AltosConvert.height, 6, state.max_height());
+			set_value(mMaxAccelView, AltosConvert.accel, 6, state.max_acceleration());
+			set_value(mMaxSpeedView, AltosConvert.speed, 6, state.max_speed());
+		}
+	}
+}
-- 
cgit v1.2.3


From 56146cd379e1319b7adcf8e22cdda55f771e11be Mon Sep 17 00:00:00 2001
From: Keith Packard <keithp@keithp.com>
Date: Tue, 23 Jun 2015 21:35:43 -0700
Subject: altosdroid: Show direction to target in recover tab

This takes the bearing to target and current direction of motion (from
the Android API) and computes a turn amount and displays that so you
don't have to know which way is north when walking towards the rocket.

Signed-off-by: Keith Packard <keithp@keithp.com>
---
 altosdroid/res/layout/tab_recover.xml              | 22 ++++++++++++++++++-
 altosdroid/res/values/strings.xml                  |  1 +
 .../src/org/altusmetrum/AltosDroid/AltosDroid.java | 25 ++++++++++++++++++++++
 .../src/org/altusmetrum/AltosDroid/TabRecover.java |  7 ++++++
 4 files changed, 54 insertions(+), 1 deletion(-)

(limited to 'altosdroid/res')

diff --git a/altosdroid/res/layout/tab_recover.xml b/altosdroid/res/layout/tab_recover.xml
index f27baa9e..c2806629 100644
--- a/altosdroid/res/layout/tab_recover.xml
+++ b/altosdroid/res/layout/tab_recover.xml
@@ -40,6 +40,26 @@
 			android:textAppearance="?android:attr/textAppearanceSmall" />
 	</RelativeLayout>
 
+	<RelativeLayout
+		android:layout_width="wrap_content"
+		android:layout_height="wrap_content" >
+
+		<TextView
+			android:id="@+id/direction_label"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:text="@string/direction_label" />
+
+		<TextView
+			android:id="@+id/direction_value"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:layout_alignParentRight="true"
+			android:layout_below="@+id/direction_label"
+			android:text=""
+			android:textAppearance="?android:attr/textAppearanceSmall" />
+	</RelativeLayout>
+
 	<RelativeLayout
 		android:layout_width="wrap_content"
 		android:layout_height="wrap_content"
@@ -208,4 +228,4 @@
 			android:textAppearance="?android:attr/textAppearanceSmall" />
 	</RelativeLayout>
 
-</LinearLayout>
\ No newline at end of file
+</LinearLayout>
diff --git a/altosdroid/res/values/strings.xml b/altosdroid/res/values/strings.xml
index 5a9d9629..8c299a35 100644
--- a/altosdroid/res/values/strings.xml
+++ b/altosdroid/res/values/strings.xml
@@ -69,6 +69,7 @@
 	<string name="speed_label">Speed</string>
 	<string name="accel_label">Acceleration</string>
 	<string name="bearing_label">Bearing</string>
+	<string name="direction_label">Direction</string>
 	<string name="elevation_label">Elevation</string>
 	<string name="range_label">Range</string>
 	<string name="distance_label">Distance</string>
diff --git a/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java b/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java
index 6cd9463a..f1da27d8 100644
--- a/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java
+++ b/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java
@@ -990,4 +990,29 @@ public class AltosDroid extends FragmentActivity implements AltosUnitsListener {
 		}
 		return false;
 	}
+
+	static String direction(AltosGreatCircle from_receiver,
+			     Location receiver) {
+		if (!receiver.hasBearing())
+			return null;
+
+		float	bearing = receiver.getBearing();
+		float	heading = (float) from_receiver.bearing - bearing;
+
+		while (heading <= -180.0f)
+			heading += 360.0f;
+		while (heading > 180.0f)
+			heading -= 360.0f;
+
+		int iheading = (int) (heading + 0.5f);
+
+		if (-1 < iheading && iheading < 1)
+			return "ahead";
+		else if (iheading < -179 || 179 < iheading)
+			return "backwards";
+		else if (iheading < 0)
+			return String.format("left %d", -iheading);
+		else
+			return String.format("right %d", iheading);
+	}
 }
diff --git a/altosdroid/src/org/altusmetrum/AltosDroid/TabRecover.java b/altosdroid/src/org/altusmetrum/AltosDroid/TabRecover.java
index 0ab20f5f..cb394dbe 100644
--- a/altosdroid/src/org/altusmetrum/AltosDroid/TabRecover.java
+++ b/altosdroid/src/org/altusmetrum/AltosDroid/TabRecover.java
@@ -30,6 +30,7 @@ import android.location.Location;
 
 public class TabRecover extends AltosDroidTab {
 	private TextView mBearingView;
+	private TextView mDirectionView;
 	private TextView mDistanceView;
 	private TextView mTargetLatitudeView;
 	private TextView mTargetLongitudeView;
@@ -44,6 +45,7 @@ public class TabRecover extends AltosDroidTab {
 		View v = inflater.inflate(R.layout.tab_recover, container, false);
 
 		mBearingView   = (TextView) v.findViewById(R.id.bearing_value);
+		mDirectionView = (TextView) v.findViewById(R.id.direction_value);
 		mDistanceView  = (TextView) v.findViewById(R.id.distance_value);
 		mTargetLatitudeView  = (TextView) v.findViewById(R.id.target_lat_value);
 		mTargetLongitudeView = (TextView) v.findViewById(R.id.target_lon_value);
@@ -62,6 +64,11 @@ public class TabRecover extends AltosDroidTab {
 		if (from_receiver != null) {
 			mBearingView.setText(String.format("%3.0f°", from_receiver.bearing));
 			set_value(mDistanceView, AltosConvert.distance, 6, from_receiver.distance);
+			String direction = AltosDroid.direction(from_receiver, receiver);
+			if (direction == null)
+				mDirectionView.setText("");
+			else
+				mDirectionView.setText(direction);
 		}
 		if (state != null && state.gps != null) {
 			mTargetLatitudeView.setText(AltosDroid.pos(state.gps.lat, "N", "S"));
-- 
cgit v1.2.3


From d015cfc1499a263549f52d46e9e5b934fcb94f53 Mon Sep 17 00:00:00 2001
From: Keith Packard <keithp@keithp.com>
Date: Sat, 11 Jul 2015 19:15:08 -0700
Subject: altoslib: Preload maps based on distance rather than number of tiles

This lets you get the specific area requested at all zoom levels,
rather than having further detail only at lower resolution zooms.

Signed-off-by: Keith Packard <keithp@keithp.com>
---
 altosdroid/res/layout/map_preload.xml              |  8 +-
 altosdroid/res/values/strings.xml                  |  2 +-
 .../altusmetrum/AltosDroid/PreloadMapActivity.java | 66 +++++++++++++--
 altoslib/AltosMapLoader.java                       | 99 ++++++++++++++++++----
 altoslib/AltosMapLoaderListener.java               |  2 +
 altosuilib/AltosUIMapPreloadNew.java               | 35 ++++++--
 6 files changed, 179 insertions(+), 33 deletions(-)

(limited to 'altosdroid/res')

diff --git a/altosdroid/res/layout/map_preload.xml b/altosdroid/res/layout/map_preload.xml
index 1d1fca32..dc613bf2 100644
--- a/altosdroid/res/layout/map_preload.xml
+++ b/altosdroid/res/layout/map_preload.xml
@@ -103,15 +103,15 @@
 	       android:prompt="@string/preload_max_zoom"
 	       android:spinnerMode="dropdown"
 	       />
-      <TextView android:id="@+id/preload_tile_radius_label"
+      <TextView android:id="@+id/preload_radius_label"
 		android:layout_width="fill_parent"
 		android:layout_height="wrap_content"
-		android:text="@string/preload_tile_radius"
+		android:text="@string/preload_radius"
 		/>
-      <Spinner android:id="@+id/preload_tile_radius"
+      <Spinner android:id="@+id/preload_radius"
 	       android:layout_width="fill_parent"
 	       android:layout_height="wrap_content"
-	       android:prompt="@string/preload_tile_radius"
+	       android:prompt="@string/preload_radius"
 	       android:spinnerMode="dropdown"
 	       />
       <Button android:id="@+id/preload_load"
diff --git a/altosdroid/res/values/strings.xml b/altosdroid/res/values/strings.xml
index 8c299a35..36b07bc2 100644
--- a/altosdroid/res/values/strings.xml
+++ b/altosdroid/res/values/strings.xml
@@ -106,7 +106,7 @@
 	<string name="preload_terrain">Terrain</string>
 	<string name="preload_min_zoom">Minimum Zoom</string>
 	<string name="preload_max_zoom">Maximum Zoom</string>
-	<string name="preload_tile_radius">Tile Radius</string>
+	<string name="preload_radius">Radius</string>
 	
 	<string name="preload_load">Load Map</string>
 </resources>
diff --git a/altosdroid/src/org/altusmetrum/AltosDroid/PreloadMapActivity.java b/altosdroid/src/org/altusmetrum/AltosDroid/PreloadMapActivity.java
index 1968edae..498b208e 100644
--- a/altosdroid/src/org/altusmetrum/AltosDroid/PreloadMapActivity.java
+++ b/altosdroid/src/org/altusmetrum/AltosDroid/PreloadMapActivity.java
@@ -61,7 +61,8 @@ public class PreloadMapActivity extends Activity implements AltosLaunchSiteListe
 	private Spinner		known_sites_spinner;
 	private Spinner		min_zoom;
 	private Spinner		max_zoom;
-	private Spinner		tile_radius;
+	private TextView	radius_label;
+	private Spinner		radius;
 
 	private EditText	latitude;
 	private EditText	longitude;
@@ -227,8 +228,17 @@ public class PreloadMapActivity extends Activity implements AltosLaunchSiteListe
 		return value(max_zoom);
 	}
 
-	private int radius() {
-		return value(tile_radius);
+	private double value_distance(Spinner spinner) {
+		return (Double) spinner.getSelectedItem();
+	}
+
+	private double radius() {
+		double r = value_distance(radius);
+		if (AltosPreferences.imperial_units())
+			r = AltosConvert.distance.inverse(r);
+		else
+			r = r * 1000;
+		return r;
 	}
 
 	private int bit(CheckBox box, int value) {
@@ -250,11 +260,14 @@ public class PreloadMapActivity extends Activity implements AltosLaunchSiteListe
 			double	lon = longitude();
 			int	min = min_z();
 			int	max = max_z();
-			int	r = radius();
+			double	r = radius();
 			int	t = types();
 
+			AltosDebug.debug("PreloadMap load %f %f %d %d %f %d\n",
+					 lat, lon, min, max, r, t);
 			loader.load(lat, lon, min, max, r, t);
 		} catch (ParseException e) {
+			AltosDebug.debug("PreloadMap load raised exception %s", e.toString());
 		}
 	}
 
@@ -276,6 +289,37 @@ public class PreloadMapActivity extends Activity implements AltosLaunchSiteListe
 		spinner.setSelection(spinner_def);
 	}
 
+
+	private void add_distance(Spinner spinner, double[] distances_km, double def_km, double[] distances_mi, double def_mi) {
+
+		ArrayAdapter<Double> adapter = new ArrayAdapter<Double>(this, android.R.layout.simple_spinner_item);
+
+		int	spinner_def = 0;
+		int	pos = 0;
+
+		double[] distances;
+		double	def;
+		if (AltosPreferences.imperial_units()) {
+			distances = distances_mi;
+			def = def_mi;
+		} else {
+			distances = distances_km;
+			def = def_km;
+		}
+
+		for (int i = 0; i < distances.length; i++) {
+			adapter.add(distances[i]);
+			if (distances[i] == def)
+				spinner_def = pos;
+			pos++;
+		}
+
+		spinner.setAdapter(adapter);
+		spinner.setSelection(spinner_def);
+	}
+
+
+
 	class SiteListListener implements OnItemSelectedListener {
 		public void onItemSelected(AdapterView<?> parent, View view, int pos, long id) {
 			AltosLaunchSite	site = (AltosLaunchSite) parent.getItemAtPosition(pos);
@@ -289,6 +333,11 @@ public class PreloadMapActivity extends Activity implements AltosLaunchSiteListe
 		}
 	}
 
+	double[]	radius_mi = { 1, 2, 5, 10, 20 };
+	double		radius_def_mi = 2;
+	double[]	radius_km = { 1, 2, 5, 10, 20, 30 };
+	double		radius_def_km = 2;
+
 	@Override
 	protected void onCreate(Bundle savedInstanceState) {
 		super.onCreate(savedInstanceState);
@@ -326,8 +375,13 @@ public class PreloadMapActivity extends Activity implements AltosLaunchSiteListe
 		add_numbers(max_zoom,
 			    AltosMap.min_zoom - AltosMap.default_zoom,
 			    AltosMap.max_zoom - AltosMap.default_zoom, 2);
-		tile_radius = (Spinner) findViewById(R.id.preload_tile_radius);
-		add_numbers(tile_radius, 1, 5, 5);
+		radius_label = (TextView) findViewById(R.id.preload_radius_label);
+		radius = (Spinner) findViewById(R.id.preload_radius);
+		if (AltosPreferences.imperial_units())
+			radius_label.setText("Radius (miles)");
+		else
+			radius_label.setText("Radius (km)");
+		add_distance(radius, radius_km, radius_def_km, radius_mi, radius_def_mi);
 
 		progress = (ProgressBar) findViewById(R.id.preload_progress);
 
diff --git a/altoslib/AltosMapLoader.java b/altoslib/AltosMapLoader.java
index cf7169ba..2cd5dbd3 100644
--- a/altoslib/AltosMapLoader.java
+++ b/altoslib/AltosMapLoader.java
@@ -24,7 +24,7 @@ import java.lang.Math;
 import java.net.URL;
 import java.net.URLConnection;
 
-public class AltosMapLoader implements AltosMapTileListener {
+public class AltosMapLoader implements AltosMapTileListener, AltosMapStoreListener {
 	AltosMapLoaderListener	listener;
 
 	double	latitude, longitude;
@@ -33,17 +33,71 @@ public class AltosMapLoader implements AltosMapTileListener {
 	int	cur_z;
 	int	all_types;
 	int	cur_type;
-	int	radius;
+	double	radius;
 
-	int	tiles_per_layer;
-	int	tiles_loaded;
+	int	tiles_loaded_layer;
+	int	tiles_loaded_total;
+	int	tiles_this_layer;
+	int	tiles_total;
 	int	layers_total;
 	int	layers_loaded;
 
 	AltosMap	map;
 
+	int tile_radius(int zoom) {
+		double	delta_lon = AltosMapTransform.lon_from_distance(latitude, radius);
+
+		AltosMapTransform t = new AltosMapTransform(256, 256, zoom + AltosMap.default_zoom, new AltosLatLon(latitude, longitude));
+
+		AltosPointDouble	center = t.point(new AltosLatLon(latitude, longitude));
+		AltosPointDouble	edge = t.point(new AltosLatLon(latitude, longitude + delta_lon));
+
+		int tile_radius = (int) Math.ceil(Math.abs(center.x - edge.x) / AltosMap.px_size);
+
+		return tile_radius;
+	}
+
+	int tiles_per_layer(int zoom) {
+		int	tile_radius = tile_radius(zoom);
+		return (tile_radius * 2 + 1) * (tile_radius * 2 + 1);
+	}
+
 	public void do_load() {
-		map.set_load_params(cur_z + AltosMap.default_zoom, cur_type, latitude, longitude, radius, this);
+		tiles_this_layer = tiles_per_layer(cur_z);
+		tiles_loaded_layer = 0;
+		listener.debug("tiles_this_layer %d (zoom %d)\n", tiles_this_layer, cur_z);
+
+		int load_radius = tile_radius(cur_z);
+		int zoom = cur_z + AltosMap.default_zoom;
+		int maptype = cur_type;
+		AltosLatLon load_centre = new AltosLatLon(latitude, longitude);
+		AltosMapTransform transform = new AltosMapTransform(256, 256, zoom, load_centre);
+
+		map.centre(load_centre);
+
+		AltosPointInt	upper_left;
+		AltosPointInt	lower_right;
+
+		AltosPointInt centre = AltosMap.floor(transform.point(load_centre));
+
+		upper_left = new AltosPointInt(centre.x - load_radius * AltosMap.px_size,
+					       centre.y - load_radius * AltosMap.px_size);
+		lower_right = new AltosPointInt(centre.x + load_radius * AltosMap.px_size,
+						centre.y + load_radius * AltosMap.px_size);
+
+
+		for (int y = (int) upper_left.y; y <= lower_right.y; y += AltosMap.px_size) {
+			for (int x = (int) upper_left.x; x <= lower_right.x; x += AltosMap.px_size) {
+				listener.debug("Make tile at %d, %d\n", x, y);
+				AltosPointInt	point = new AltosPointInt(x, y);
+				AltosLatLon	ul = transform.lat_lon(point);
+				AltosLatLon	center = transform.lat_lon(new AltosPointDouble(x + AltosMap.px_size/2, y + AltosMap.px_size/2));
+				AltosMapTile	tile = map.map_interface.new_tile(this, ul, center, zoom, maptype, AltosMap.px_size);
+				tile.add_store_listener(this);
+				if (tile.store_status() != AltosMapTile.loading)
+					notify_tile(tile, tile.store_status());
+			}
+		}
 	}
 
 	public int next_type(int start) {
@@ -84,16 +138,23 @@ public class AltosMapLoader implements AltosMapTileListener {
 		}
 
 		cur_type = next_type(0);
-		tiles_per_layer = (radius * 2 + 1) * (radius * 2 + 1);
+
+		for (int z = min_z; z <= max_z; z++)
+			tiles_total += tiles_per_layer(z);
+
 		layers_total = (max_z - min_z + 1) * ntype;
 		layers_loaded = 0;
-		tiles_loaded = 0;
+		tiles_loaded_total = 0;
+
+		listener.debug("total tiles %d\n", tiles_total);
 
-		listener.loader_start(layers_total * tiles_per_layer);
+		listener.loader_start(tiles_total);
 		do_load();
 	}
 
-	public void load(double latitude, double longitude, int min_z, int max_z, int radius, int all_types) {
+	public void load(double latitude, double longitude, int min_z, int max_z, double radius, int all_types) {
+		listener.debug("lat %f lon %f min_z %d max_z %d radius %f all_types %d\n",
+			       latitude, longitude, min_z, max_z, radius, all_types);
 		this.latitude = latitude;
 		this.longitude = longitude;
 		this.min_z = min_z;
@@ -103,7 +164,7 @@ public class AltosMapLoader implements AltosMapTileListener {
 		start_load();
 	}
 
-	public synchronized void notify_tile(AltosMapTile tile, int status) {
+	public synchronized void notify_store(AltosMapStore store, int status) {
 		boolean	do_next = false;
 		if (status == AltosMapTile.loading)
 			return;
@@ -111,24 +172,30 @@ public class AltosMapLoader implements AltosMapTileListener {
 		if (layers_loaded >= layers_total)
 			return;
 
-		++tiles_loaded;
+		++tiles_loaded_total;
+		++tiles_loaded_layer;
+		listener.debug("total %d layer %d\n", tiles_loaded_total, tiles_loaded_layer);
 
-		if (tiles_loaded == tiles_per_layer) {
-			tiles_loaded = 0;
+		if (tiles_loaded_layer == tiles_this_layer) {
 			++layers_loaded;
+			listener.debug("%d layers loaded\n", layers_loaded);
 			if (layers_loaded == layers_total) {
-				listener.loader_done(layers_total * tiles_per_layer);
+				listener.loader_done(tiles_total);
 				return;
 			} else {
 				do_next = true;
 			}
 		}
-		listener.loader_notify(layers_loaded * tiles_per_layer + tiles_loaded,
-				       layers_total * tiles_per_layer, tile.store.file.toString());
+		listener.loader_notify(tiles_loaded_total,
+				       tiles_total, store.file.toString());
 		if (do_next)
 			next_load();
 	}
 
+	public synchronized void notify_tile(AltosMapTile tile, int status) {
+		notify_store(tile.store, status);
+	}
+
 	public AltosMapCache cache() { return map.cache(); }
 
 	public AltosMapLoader(AltosMap map, AltosMapLoaderListener listener) {
diff --git a/altoslib/AltosMapLoaderListener.java b/altoslib/AltosMapLoaderListener.java
index 79f8b9df..11f59b28 100644
--- a/altoslib/AltosMapLoaderListener.java
+++ b/altoslib/AltosMapLoaderListener.java
@@ -23,4 +23,6 @@ public interface AltosMapLoaderListener {
 	public abstract void loader_notify(int cur, int max, String name);
 
 	public abstract void loader_done(int max);
+
+	public abstract void debug(String format, Object ... arguments);
 }
diff --git a/altosuilib/AltosUIMapPreloadNew.java b/altosuilib/AltosUIMapPreloadNew.java
index 4a5764c8..ba559534 100644
--- a/altosuilib/AltosUIMapPreloadNew.java
+++ b/altosuilib/AltosUIMapPreloadNew.java
@@ -140,10 +140,15 @@ public class AltosUIMapPreloadNew extends AltosUIFrame implements ActionListener
 
 	JComboBox<Integer>	min_zoom;
 	JComboBox<Integer>	max_zoom;
-	JComboBox<Integer>	radius;
+	JComboBox<Double>	radius;
 
 	Integer[]		zooms = { -12, -11, -10, -9, -8, -7, -6, -5, -4, -3, -2, -1, 0, 1, 2, 3, 4, 5, 6 };
-	Integer[]		radii = { 1, 2, 3, 4, 5 };
+
+	Double[]	radius_mi = { 1.0, 2.0, 5.0, 10.0, 20.0 };
+	Double		radius_def_mi = 5.0;
+	Double[]	radius_km = { 2.0, 5.0, 10.0, 20.0, 30.0 };
+	Double		radius_def_km = 10.0;
+
 
 	static final String[]	lat_hemi_names = { "N", "S" };
 	static final String[]	lon_hemi_names = { "E", "W" };
@@ -183,6 +188,11 @@ public class AltosUIMapPreloadNew extends AltosUIFrame implements ActionListener
 			});
 	}
 
+	public void debug(String format, Object ... arguments) {
+		System.out.printf(format, arguments);
+	}
+
+
 	private int all_types() {
 		int all_types = 0;
 		for (int t = AltosMap.maptype_hybrid; t <= AltosMap.maptype_terrain; t++)
@@ -219,7 +229,12 @@ public class AltosUIMapPreloadNew extends AltosUIFrame implements ActionListener
 					int max_z = (Integer) max_zoom.getSelectedItem();
 					if (max_z < min_z)
 						max_z = min_z;
-					int r = (Integer) radius.getSelectedItem();
+					Double r = (Double) radius.getSelectedItem();
+
+					if (AltosPreferences.imperial_units())
+						r = AltosConvert.distance.inverse(r);
+					else
+						r = r * 1000;
 					loading = true;
 
 					loader.load(latitude, longitude, min_z, max_z, r, all_types());
@@ -430,13 +445,21 @@ public class AltosUIMapPreloadNew extends AltosUIFrame implements ActionListener
 		c.gridy = 3;
 		pane.add(max_zoom, c);
 
-		JLabel radius_label = new JLabel("Tile Radius");
+		JLabel radius_label = new JLabel(String.format("Map Radius (%s)",
+							       AltosPreferences.imperial_units() ? "miles" : "km"));
 		c.gridx = 4;
 		c.gridy = 4;
 		pane.add(radius_label, c);
 
-		radius = new JComboBox<Integer>(radii);
-		radius.setSelectedItem(radii[4]);
+		Double[]	radii;
+		Double		radius_default;
+
+		if (AltosPreferences.imperial_units())
+			radii = radius_mi;
+		else
+			radii = radius_km;
+		radius = new JComboBox<Double>(radii);
+		radius.setSelectedItem(radii[2]);
 		radius.setEditable(true);
 		c.gridx = 5;
 		c.gridy = 4;
-- 
cgit v1.2.3


From ed682ca39496849b6c0d6bdf81bee6263864895f Mon Sep 17 00:00:00 2001
From: Keith Packard <keithp@keithp.com>
Date: Sat, 11 Jul 2015 19:55:43 -0700
Subject: 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>
---
 altosdroid/Notebook                                |  18 +-
 altosdroid/res/layout/tab_flight.xml               | 751 +++++++++----------
 altosdroid/res/layout/tab_pad.xml                  | 803 ++++++++++++---------
 altosdroid/res/values/strings.xml                  |  16 +-
 .../src/org/altusmetrum/AltosDroid/TabPad.java     |  86 ++-
 5 files changed, 940 insertions(+), 734 deletions(-)

(limited to 'altosdroid/res')

diff --git a/altosdroid/Notebook b/altosdroid/Notebook
index 22271e7c..73b5ed27 100644
--- a/altosdroid/Notebook
+++ b/altosdroid/Notebook
@@ -15,7 +15,9 @@ Desired AltosDroid feature list
 
  *) Monitor-idle mode
 
- *) Monitor TeleMega igniters
+ *) Online maps comes up tracking object at 0,0
+
+ *) Have names for each serial number, default to callsign
 
 Completed features
 
@@ -90,3 +92,17 @@ Completed features
  *) Make voice responses depend on selected tab
 
 	Done.
+
+ *) Monitor TeleMega igniters
+
+	Done. Visible only in Pad tab
+
+ *) Make it harder to switch trackers in map view. Too easy to touch
+    the screen and switch on accident.
+
+	Done. A menu pops up with trackers within a small radius of
+	the touch point, letting you cancel if that wasn't your intent.
+
+ *) Make sure it keeps talking with the screen blanked
+
+	Done. Don't shut down voice when stopping UI.
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>
diff --git a/altosdroid/res/values/strings.xml b/altosdroid/res/values/strings.xml
index 36b07bc2..e7014fc9 100644
--- a/altosdroid/res/values/strings.xml
+++ b/altosdroid/res/values/strings.xml
@@ -77,11 +77,15 @@
 	<string name="max_height_label">Max Height</string>
 	<string name="max_speed_label">Max Speed</string>
 	<string name="max_accel_label">Max Accel</string>
-	<string name="battery_voltage_label">Battery Voltage</string>
+	<string name="battery_voltage_label">Battery</string>
 	<string name="receiver_voltage_label">Receiver Battery</string>
-	<string name="apogee_voltage_label">Apogee Igniter Voltage</string>
-	<string name="main_voltage_label">Main Igniter Voltage</string>
-	<string name="logging_label">On-board Data Logging</string>
+	<string name="apogee_voltage_label">Apogee Igniter</string>
+	<string name="main_voltage_label">Main Igniter</string>
+	<string name="ignite_a_voltage_label">Igniter A</string>
+	<string name="ignite_b_voltage_label">Igniter B</string>
+	<string name="ignite_c_voltage_label">Igniter C</string>
+	<string name="ignite_d_voltage_label">Igniter D</string>
+	<string name="logging_label">Data Logging</string>
 	<string name="gps_locked_label">GPS Locked</string>
 	<string name="gps_ready_label">GPS Ready</string>
 	<string name="latitude_label">Latitude</string>
@@ -90,9 +94,7 @@
 	<string name="target_longitude_label">Tar Lon</string>
 	<string name="receiver_latitude_label">My Lat</string>
 	<string name="receiver_longitude_label">My Lon</string>
-	<string name="pad_lat_label">Pad Lat</string>
-	<string name="pad_lon_label">Pad Lon</string>
-	<string name="pad_alt_label">Pad Alt</string>
+	<string name="receiver_altitude_label">My Alt</string>
 
 	<!-- Map preload -->
 	<string name="preload_site_label">Known Launch Sites</string>
diff --git a/altosdroid/src/org/altusmetrum/AltosDroid/TabPad.java b/altosdroid/src/org/altusmetrum/AltosDroid/TabPad.java
index cfc55261..f6204547 100644
--- a/altosdroid/src/org/altusmetrum/AltosDroid/TabPad.java
+++ b/altosdroid/src/org/altusmetrum/AltosDroid/TabPad.java
@@ -54,9 +54,14 @@ public class TabPad extends AltosDroidTab {
 	private TextView gps_ready_view;
 	private GoNoGoLights gps_ready_lights;
 
-	private TextView pad_latitude_view;
-	private TextView pad_longitude_view;
-	private TextView pad_altitude_view;
+	private TextView receiver_latitude_view;
+	private TextView receiver_longitude_view;
+	private TextView receiver_altitude_view;
+
+	private TextView[] ignite_voltage_view = new TextView[4];
+	private TextView[] ignite_voltage_label = new TextView[4];
+	private GoNoGoLights[] ignite_lights = new GoNoGoLights[4];
+
 
 	@Override
 	public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
@@ -99,9 +104,46 @@ public class TabPad extends AltosDroidTab {
 		                                   (ImageView) v.findViewById(R.id.gps_ready_greenled),
 		                                   getResources());
 
-		pad_latitude_view = (TextView) v.findViewById(R.id.pad_lat_value);
-		pad_longitude_view = (TextView) v.findViewById(R.id.pad_lon_value);
-		pad_altitude_view = (TextView) v.findViewById(R.id.pad_alt_value);
+		for (int i = 0; i < 4; i++) {
+			int view_id, label_id, lights_id;
+			int red_id, green_id;
+			switch (i) {
+			case 0:
+			default:
+				view_id = R.id.ignite_a_voltage_value;
+				label_id = R.id.ignite_a_voltage_label;
+				red_id = R.id.ignite_a_redled;
+				green_id = R.id.ignite_a_greenled;
+				break;
+			case 1:
+				view_id = R.id.ignite_b_voltage_value;
+				label_id = R.id.ignite_b_voltage_label;
+				red_id = R.id.ignite_b_redled;
+				green_id = R.id.ignite_b_greenled;
+				break;
+			case 2:
+				view_id = R.id.ignite_c_voltage_value;
+				label_id = R.id.ignite_c_voltage_label;
+				red_id = R.id.ignite_c_redled;
+				green_id = R.id.ignite_c_greenled;
+				break;
+			case 3:
+				view_id = R.id.ignite_d_voltage_value;
+				label_id = R.id.ignite_d_voltage_label;
+				red_id = R.id.ignite_d_redled;
+				green_id = R.id.ignite_d_greenled;
+				break;
+			}
+			ignite_voltage_view[i] = (TextView) v.findViewById(view_id);
+			ignite_voltage_label[i] = (TextView) v.findViewById(label_id);
+			ignite_lights[i] = new GoNoGoLights((ImageView) v.findViewById(red_id),
+							     (ImageView) v.findViewById(green_id),
+							     getResources());
+		}
+
+		receiver_latitude_view = (TextView) v.findViewById(R.id.receiver_lat_value);
+		receiver_longitude_view = (TextView) v.findViewById(R.id.receiver_lon_value);
+		receiver_altitude_view = (TextView) v.findViewById(R.id.receiver_alt_value);
         return v;
 	}
 
@@ -109,13 +151,13 @@ public class TabPad extends AltosDroidTab {
 
 	public void show(TelemetryState telem_state, AltosState state, AltosGreatCircle from_receiver, Location receiver) {
 		if (state != null) {
-			battery_voltage_view.setText(AltosDroid.number("%4.2f V", state.battery_voltage));
+			battery_voltage_view.setText(AltosDroid.number(" %4.2f V", state.battery_voltage));
 			battery_lights.set(state.battery_voltage >= AltosLib.ao_battery_good, state.battery_voltage == AltosLib.MISSING);
 			if (state.apogee_voltage == AltosLib.MISSING) {
 				apogee_voltage_view.setVisibility(View.GONE);
 				apogee_voltage_label.setVisibility(View.GONE);
 			} else {
-				apogee_voltage_view.setText(AltosDroid.number("%4.2f V", state.apogee_voltage));
+				apogee_voltage_view.setText(AltosDroid.number(" %4.2f V", state.apogee_voltage));
 				apogee_voltage_view.setVisibility(View.VISIBLE);
 				apogee_voltage_label.setVisibility(View.VISIBLE);
 			}
@@ -124,12 +166,27 @@ public class TabPad extends AltosDroidTab {
 				main_voltage_view.setVisibility(View.GONE);
 				main_voltage_label.setVisibility(View.GONE);
 			} else {
-				main_voltage_view.setText(AltosDroid.number("%4.2f V", state.main_voltage));
+				main_voltage_view.setText(AltosDroid.number(" %4.2f V", state.main_voltage));
 				main_voltage_view.setVisibility(View.VISIBLE);
 				main_voltage_label.setVisibility(View.VISIBLE);
 			}
 			main_lights.set(state.main_voltage >= AltosLib.ao_igniter_good, state.main_voltage == AltosLib.MISSING);
 
+			int num_igniter = state.ignitor_voltage == null ? 0 : state.ignitor_voltage.length;
+
+			for (int i = 0; i < 4; i++) {
+				double voltage = i >= num_igniter ? AltosLib.MISSING : state.ignitor_voltage[i];
+				if (voltage == AltosLib.MISSING) {
+					ignite_voltage_view[i].setVisibility(View.GONE);
+					ignite_voltage_label[i].setVisibility(View.GONE);
+				} else {
+					ignite_voltage_view[i].setText(AltosDroid.number(" %4.2f V", voltage));
+					ignite_voltage_view[i].setVisibility(View.VISIBLE);
+					ignite_voltage_label[i].setVisibility(View.VISIBLE);
+				}
+				ignite_lights[i].set(voltage >= AltosLib.ao_igniter_good, voltage == AltosLib.MISSING);
+			}
+
 			if (state.flight != 0) {
 				if (state.state <= AltosLib.ao_flight_pad)
 					data_logging_view.setText("Ready to record");
@@ -145,7 +202,7 @@ public class TabPad extends AltosDroidTab {
 			if (state.gps != null) {
 				int soln = state.gps.nsat;
 				int nsat = state.gps.cc_gps_sat != null ? state.gps.cc_gps_sat.length : 0;
-				gps_locked_view.setText(String.format("%4d in soln, %4d in view", soln, nsat));
+				gps_locked_view.setText(String.format("%d in soln, %d in view", soln, nsat));
 				gps_locked_lights.set(state.gps.locked && state.gps.nsat >= 4, false);
 				if (state.gps_ready)
 					gps_ready_view.setText("Ready");
@@ -161,7 +218,7 @@ public class TabPad extends AltosDroidTab {
 				receiver_voltage_view.setVisibility(View.GONE);
 				receiver_voltage_label.setVisibility(View.GONE);
 			} else {
-				receiver_voltage_view.setText(AltosDroid.number("%4.2f V", telem_state.receiver_battery));
+				receiver_voltage_view.setText(AltosDroid.number(" %4.2f V", telem_state.receiver_battery));
 				receiver_voltage_view.setVisibility(View.VISIBLE);
 				receiver_voltage_label.setVisibility(View.VISIBLE);
 			}
@@ -172,10 +229,9 @@ public class TabPad extends AltosDroidTab {
 			double altitude = AltosLib.MISSING;
 			if (receiver.hasAltitude())
 				altitude = receiver.getAltitude();
-			pad_latitude_view.setText(AltosDroid.pos(receiver.getLatitude(), "N", "S"));
-			pad_longitude_view.setText(AltosDroid.pos(receiver.getLongitude(), "E", "W"));
-			set_value(pad_altitude_view, AltosConvert.height, 6, altitude);
+			receiver_latitude_view.setText(AltosDroid.pos(receiver.getLatitude(), "N", "S"));
+			receiver_longitude_view.setText(AltosDroid.pos(receiver.getLongitude(), "E", "W"));
+			set_value(receiver_altitude_view, AltosConvert.height, 1, altitude);
 		}
 	}
-
 }
-- 
cgit v1.2.3


From c4af5cb233013b35d6763f5adf8d11b47f847111 Mon Sep 17 00:00:00 2001
From: Keith Packard <keithp@keithp.com>
Date: Sat, 11 Jul 2015 22:17:16 -0700
Subject: altosdroid: Clean up tab layout

Fuss with weights and gravitys, then add some wrapping layouts to get
things looking reasonable on small and larger screens.

Signed-off-by: Keith Packard <keithp@keithp.com>
---
 altosdroid/res/layout/tab_flight.xml               | 568 ++++++-------
 altosdroid/res/layout/tab_map.xml                  |  12 +-
 altosdroid/res/layout/tab_pad.xml                  | 911 +++++++++++----------
 altosdroid/res/layout/tab_recover.xml              | 446 +++++-----
 .../org/altusmetrum/AltosDroid/GoNoGoLights.java   |  13 -
 .../src/org/altusmetrum/AltosDroid/TabFlight.java  |  27 +-
 .../src/org/altusmetrum/AltosDroid/TabPad.java     |  45 +-
 7 files changed, 1021 insertions(+), 1001 deletions(-)

(limited to 'altosdroid/res')

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>
diff --git a/altosdroid/res/layout/tab_map.xml b/altosdroid/res/layout/tab_map.xml
index 2388a20b..952abd49 100644
--- a/altosdroid/res/layout/tab_map.xml
+++ b/altosdroid/res/layout/tab_map.xml
@@ -26,6 +26,7 @@
       android:baselineAligned="true"
       android:orientation="horizontal"
       android:layout_weight="1">
+
     <LinearLayout
 	android:id="@+id/map_online"
 	android:orientation="horizontal"
@@ -33,11 +34,12 @@
 	android:layout_height="fill_parent"
 	android:layout_weight="1">
     </LinearLayout>
-    <org.altusmetrum.AltosDroid.AltosMapOffline android:id="@+id/map_offline"
-						android:layout_width="fill_parent"
-						android:layout_height="wrap_content"
-						android:layout_weight="1"
-						/>
+
+    <org.altusmetrum.AltosDroid.AltosMapOffline
+	android:id="@+id/map_offline"
+	android:layout_width="fill_parent"
+	android:layout_height="wrap_content"
+	android:layout_weight="1"/>
   </FrameLayout>
   
   <LinearLayout
diff --git a/altosdroid/res/layout/tab_pad.xml b/altosdroid/res/layout/tab_pad.xml
index f7a69f21..88648c3b 100644
--- a/altosdroid/res/layout/tab_pad.xml
+++ b/altosdroid/res/layout/tab_pad.xml
@@ -16,465 +16,480 @@
      59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
 -->
 
-<TableLayout
+<LinearLayout
     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"
+  <TableLayout
+      xmlns:android="http://schemas.android.com/apk/res/android"
+      android:stretchColumns="2,3"
+      android:layout_weight="0"
       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
+    <TableRow
+	android:layout_gravity="center"
+	android:layout_weight="1"
+	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:id="@+id/receiver_row"
 	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:layout_gravity="center"
+	android:layout_weight="1"
+	android:padding="2dip"
+	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:contentDescription="@string/receiver_voltage_label"
+	  android:src="@drawable/grayled" />
+
+      <TextView
+	  android:id="@+id/receiver_voltage_label"
+	  android:layout_width="wrap_content"
+	  android:layout_height="wrap_content"
+	  android:text="@string/receiver_voltage_label" />
+
+      <TextView
+	  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:layout_gravity="center"
+	android:layout_weight="1"
+	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:layout_gravity="center"
+	android:layout_weight="1"
+	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:layout_gravity="center"
+	android:layout_weight="1"
+	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:id="@+id/apogee_row"
 	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:layout_gravity="center"
+	android:layout_weight="1"
+	android:padding="2dip"
+	android:layout_width="wrap_content"
+	android:layout_height="wrap_content">
+
+      <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:contentDescription="@string/apogee_voltage_label"
+	  android:src="@drawable/grayled" />
+
+      <TextView
+	  android:id="@+id/apogee_voltage_label"
+	  android:layout_width="wrap_content"
+	  android:layout_height="wrap_content"
+	  android:text="@string/apogee_voltage_label" />
+
+      <TextView
+	  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:id="@+id/main_row"
 	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:layout_gravity="center"
+	android:layout_weight="1"
+	android:padding="2dip"
+	android:layout_width="wrap_content"
+	android:layout_height="wrap_content" >
+
+      <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:contentDescription="@string/main_voltage_label"
+	  android:src="@drawable/grayled" />
+
+      <TextView
+	  android:id="@+id/main_voltage_label"
+	  android:layout_width="wrap_content"
+	  android:layout_height="wrap_content"
+	  android:text="@string/main_voltage_label" />
+
+      <TextView
+	  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:id="@+id/ignite_a_row"
 	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:layout_gravity="center"
+	android:layout_weight="1"
+	android:padding="2dip"
+	android:layout_width="wrap_content"
+	android:layout_height="wrap_content" >
+
+      <ImageView
+	  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: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: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: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:id="@+id/ignite_b_row"
 	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:layout_gravity="center"
+	android:layout_weight="1"
+	android:padding="2dip"
+	android:layout_width="wrap_content"
+	android:layout_height="wrap_content" >
+
+      <ImageView
+	  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: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: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: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:id="@+id/ignite_c_row"
 	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:layout_gravity="center"
+	android:layout_weight="1"
+	android:padding="2dip"
+	android:layout_width="wrap_content"
+	android:layout_height="wrap_content" >
+
+      <ImageView
+	  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: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: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: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:id="@+id/ignite_d_row"
 	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>
+	android:layout_gravity="center"
+	android:layout_weight="1"
+	android:padding="2dip"
+	android:layout_width="wrap_content"
+	android:layout_height="wrap_content" >
+
+      <ImageView
+	  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: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: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: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>
+</LinearLayout>
diff --git a/altosdroid/res/layout/tab_recover.xml b/altosdroid/res/layout/tab_recover.xml
index c2806629..201f45ed 100644
--- a/altosdroid/res/layout/tab_recover.xml
+++ b/altosdroid/res/layout/tab_recover.xml
@@ -15,217 +15,237 @@
      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:orientation="vertical" >
-
-	<RelativeLayout
-		android:layout_width="wrap_content"
-		android:layout_height="wrap_content" >
-
-		<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="wrap_content"
-		android:layout_height="wrap_content" >
-
-		<TextView
-			android:id="@+id/direction_label"
-			android:layout_width="wrap_content"
-			android:layout_height="wrap_content"
-			android:text="@string/direction_label" />
-
-		<TextView
-			android:id="@+id/direction_value"
-			android:layout_width="wrap_content"
-			android:layout_height="wrap_content"
-			android:layout_alignParentRight="true"
-			android:layout_below="@+id/direction_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/distance_label"
-			android:layout_width="wrap_content"
-			android:layout_height="wrap_content"
-			android:text="@string/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>
-
-	<RelativeLayout
-		android:layout_width="wrap_content"
-		android:layout_height="wrap_content"
-		android:paddingTop="5dp" >
-
-		<TextView
-			android:id="@+id/target_lat_label"
-			android:layout_width="wrap_content"
-			android:layout_height="wrap_content"
-			android:text="@string/target_latitude_label" />
-
-		<TextView
-			android:id="@+id/target_lat_value"
-			android:layout_width="wrap_content"
-			android:layout_height="wrap_content"
-			android:layout_alignParentRight="true"
-			android:layout_below="@id/target_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/target_lon_label"
-			android:layout_width="wrap_content"
-			android:layout_height="wrap_content"
-			android:text="@string/target_longitude_label" />
-
-		<TextView
-			android:id="@+id/target_lon_value"
-			android:layout_width="wrap_content"
-			android:layout_height="wrap_content"
-			android:layout_alignParentRight="true"
-			android:layout_below="@id/target_lon_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/receiver_lat_label"
-			android:layout_width="wrap_content"
-			android:layout_height="wrap_content"
-			android:text="@string/receiver_latitude_label" />
-
-		<TextView
-			android:id="@+id/receiver_lat_value"
-			android:layout_width="wrap_content"
-			android:layout_height="wrap_content"
-			android:layout_alignParentRight="true"
-			android:layout_below="@id/receiver_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/receiver_lon_label"
-			android:layout_width="wrap_content"
-			android:layout_height="wrap_content"
-			android:text="@string/receiver_longitude_label" />
-
-		<TextView
-			android:id="@+id/receiver_lon_value"
-			android:layout_width="wrap_content"
-			android:layout_height="wrap_content"
-			android:layout_alignParentRight="true"
-			android:layout_below="@id/receiver_lon_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/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>
-
-	<RelativeLayout
-		android:layout_width="wrap_content"
-		android:layout_height="wrap_content"
-		android:paddingTop="5dp" >
-
-		<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="wrap_content"
-		android:layout_height="wrap_content"
-		android:paddingTop="5dp" >
-
-		<TextView
-			android:id="@+id/max_accel_label"
-			android:layout_width="wrap_content"
-			android:layout_height="wrap_content"
-			android:text="@string/max_accel_label" />
-
-		<TextView
-			android:id="@+id/max_accel_value"
-			android:layout_width="wrap_content"
-			android:layout_height="wrap_content"
-			android:layout_alignParentRight="true"
-			android:layout_below="@id/max_accel_label"
-			android:text=""
-			android:textAppearance="?android:attr/textAppearanceSmall" />
-	</RelativeLayout>
-
+<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_weight="0"
+      android:layout_width="fill_parent"
+      android:layout_height="wrap_content"
+      android:orientation="vertical" >
+
+    <RelativeLayout
+	android:layout_gravity="fill"
+	android:layout_weight="1"
+	android:layout_width="wrap_content"
+	android:layout_height="wrap_content" >
+
+      <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_gravity="fill"
+	android:layout_weight="1"
+	android:layout_width="wrap_content"
+	android:layout_height="wrap_content" >
+
+      <TextView
+	  android:id="@+id/direction_label"
+	  android:layout_width="wrap_content"
+	  android:layout_height="wrap_content"
+	  android:text="@string/direction_label" />
+
+      <TextView
+	  android:id="@+id/direction_value"
+	  android:layout_width="wrap_content"
+	  android:layout_height="wrap_content"
+	  android:layout_alignParentRight="true"
+	  android:layout_below="@+id/direction_label"
+	  android:text=""
+	  android:textAppearance="?android:attr/textAppearanceSmall" />
+    </RelativeLayout>
+
+    <RelativeLayout
+	android:layout_gravity="fill"
+	android:layout_weight="1"
+	android:layout_width="wrap_content"
+	android:layout_height="wrap_content">
+
+      <TextView
+	  android:id="@+id/distance_label"
+	  android:layout_width="wrap_content"
+	  android:layout_height="wrap_content"
+	  android:text="@string/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>
+
+    <RelativeLayout
+	android:layout_gravity="fill"
+	android:layout_weight="1"
+	android:layout_width="wrap_content"
+	android:layout_height="wrap_content">
+
+      <TextView
+	  android:id="@+id/target_lat_label"
+	  android:layout_width="wrap_content"
+	  android:layout_height="wrap_content"
+	  android:text="@string/target_latitude_label" />
+
+      <TextView
+	  android:id="@+id/target_lat_value"
+	  android:layout_width="wrap_content"
+	  android:layout_height="wrap_content"
+	  android:layout_alignParentRight="true"
+	  android:layout_below="@id/target_lat_label"
+	  android:text=""
+	  android:textAppearance="?android:attr/textAppearanceSmall" />
+    </RelativeLayout>
+
+    <RelativeLayout
+	android:layout_gravity="fill"
+	android:layout_weight="1"
+	android:layout_width="wrap_content"
+	android:layout_height="wrap_content">
+
+      <TextView
+	  android:id="@+id/target_lon_label"
+	  android:layout_width="wrap_content"
+	  android:layout_height="wrap_content"
+	  android:text="@string/target_longitude_label" />
+
+      <TextView
+	  android:id="@+id/target_lon_value"
+	  android:layout_width="wrap_content"
+	  android:layout_height="wrap_content"
+	  android:layout_alignParentRight="true"
+	  android:layout_below="@id/target_lon_label"
+	  android:text=""
+	  android:textAppearance="?android:attr/textAppearanceSmall" />
+    </RelativeLayout>
+
+    <RelativeLayout
+	android:layout_gravity="fill"
+	android:layout_weight="1"
+	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:text="@string/receiver_latitude_label" />
+
+      <TextView
+	  android:id="@+id/receiver_lat_value"
+	  android:layout_width="wrap_content"
+	  android:layout_height="wrap_content"
+	  android:layout_alignParentRight="true"
+	  android:layout_below="@id/receiver_lat_label"
+	  android:text=""
+	  android:textAppearance="?android:attr/textAppearanceSmall" />
+    </RelativeLayout>
+
+    <RelativeLayout
+	android:layout_gravity="fill"
+	android:layout_weight="1"
+	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:text="@string/receiver_longitude_label" />
+
+      <TextView
+	  android:id="@+id/receiver_lon_value"
+	  android:layout_width="wrap_content"
+	  android:layout_height="wrap_content"
+	  android:layout_alignParentRight="true"
+	  android:layout_below="@id/receiver_lon_label"
+	  android:text=""
+	  android:textAppearance="?android:attr/textAppearanceSmall" />
+    </RelativeLayout>
+
+    <RelativeLayout
+	android:layout_gravity="fill"
+	android:layout_weight="1"
+	android:layout_width="wrap_content"
+	android:layout_height="wrap_content">
+
+      <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>
+
+    <RelativeLayout
+	android:layout_gravity="fill"
+	android:layout_weight="1"
+	android:layout_width="wrap_content"
+	android:layout_height="wrap_content">
+
+      <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_gravity="fill"
+	android:layout_weight="1"
+	android:layout_width="wrap_content"
+	android:layout_height="wrap_content">
+
+      <TextView
+	  android:id="@+id/max_accel_label"
+	  android:layout_width="wrap_content"
+	  android:layout_height="wrap_content"
+	  android:text="@string/max_accel_label" />
+
+      <TextView
+	  android:id="@+id/max_accel_value"
+	  android:layout_width="wrap_content"
+	  android:layout_height="wrap_content"
+	  android:layout_alignParentRight="true"
+	  android:layout_below="@id/max_accel_label"
+	  android:text=""
+	  android:textAppearance="?android:attr/textAppearanceSmall" />
+    </RelativeLayout>
+  </LinearLayout>
 </LinearLayout>
diff --git a/altosdroid/src/org/altusmetrum/AltosDroid/GoNoGoLights.java b/altosdroid/src/org/altusmetrum/AltosDroid/GoNoGoLights.java
index 267c90f8..6cecbdf1 100644
--- a/altosdroid/src/org/altusmetrum/AltosDroid/GoNoGoLights.java
+++ b/altosdroid/src/org/altusmetrum/AltosDroid/GoNoGoLights.java
@@ -52,27 +52,14 @@ public class GoNoGoLights {
 		missing = m;
 		set = true;
 		if (missing) {
-			hide();
 			red.setImageDrawable(dGray);
 			green.setImageDrawable(dGray);
 		} else if (state) {
 			red.setImageDrawable(dGray);
 			green.setImageDrawable(dGreen);
-			show();
 		} else {
 			red.setImageDrawable(dRed);
 			green.setImageDrawable(dGray);
-			show();
 		}
 	}
-
-	public void show() {
-		red.setVisibility(View.VISIBLE);
-		green.setVisibility(View.VISIBLE);
-	}
-
-	public void hide() {
-		red.setVisibility(View.GONE);
-		green.setVisibility(View.GONE);
-	}
 }
diff --git a/altosdroid/src/org/altusmetrum/AltosDroid/TabFlight.java b/altosdroid/src/org/altusmetrum/AltosDroid/TabFlight.java
index e0d49a1c..a02ae3a2 100644
--- a/altosdroid/src/org/altusmetrum/AltosDroid/TabFlight.java
+++ b/altosdroid/src/org/altusmetrum/AltosDroid/TabFlight.java
@@ -22,11 +22,8 @@ import org.altusmetrum.altoslib_7.*;
 import android.app.Activity;
 import android.os.Bundle;
 import android.support.v4.app.Fragment;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.ImageView;
-import android.widget.TextView;
+import android.view.*;
+import android.widget.*;
 import android.location.Location;
 
 public class TabFlight extends AltosDroidTab {
@@ -41,9 +38,11 @@ public class TabFlight extends AltosDroidTab {
 	private TextView distance_view;
 	private TextView latitude_view;
 	private TextView longitude_view;
+	private View apogee_view;
 	private TextView apogee_voltage_view;
 	private TextView apogee_voltage_label;
 	private GoNoGoLights apogee_lights;
+	private View main_view;
 	private TextView main_voltage_view;
 	private TextView main_voltage_label;
 	private GoNoGoLights main_lights;
@@ -64,12 +63,14 @@ public class TabFlight extends AltosDroidTab {
 		latitude_view  = (TextView) v.findViewById(R.id.lat_value);
 		longitude_view = (TextView) v.findViewById(R.id.lon_value);
 
+		apogee_view = v.findViewById(R.id.apogee_view);
 		apogee_voltage_view = (TextView) v.findViewById(R.id.apogee_voltage_value);
 		apogee_lights = new GoNoGoLights((ImageView) v.findViewById(R.id.apogee_redled),
 		                                 (ImageView) v.findViewById(R.id.apogee_greenled),
 		                                 getResources());
 		apogee_voltage_label = (TextView) v.findViewById(R.id.apogee_voltage_label);
 
+		main_view = v.findViewById(R.id.main_view);
 		main_voltage_view = (TextView) v.findViewById(R.id.main_voltage_value);
 		main_lights = new GoNoGoLights((ImageView) v.findViewById(R.id.main_redled),
 		                               (ImageView) v.findViewById(R.id.main_greenled),
@@ -106,27 +107,19 @@ public class TabFlight extends AltosDroidTab {
 			}
 
 			if (state.apogee_voltage == AltosLib.MISSING) {
-				apogee_voltage_view.setVisibility(View.GONE);
-				apogee_voltage_label.setVisibility(View.GONE);
-				apogee_lights.hide();
+				apogee_view.setVisibility(View.GONE);
 			} else {
 				apogee_voltage_view.setText(AltosDroid.number("%4.2f V", state.apogee_voltage));
-				apogee_voltage_view.setVisibility(View.VISIBLE);
-				apogee_voltage_label.setVisibility(View.VISIBLE);
 				apogee_lights.set(state.apogee_voltage > 3.2, state.apogee_voltage == AltosLib.MISSING);
-				apogee_lights.show();
+				apogee_view.setVisibility(View.VISIBLE);
 			}
 
 			if (state.main_voltage == AltosLib.MISSING) {
-				main_voltage_view.setVisibility(View.GONE);
-				main_voltage_label.setVisibility(View.GONE);
-				main_lights.hide();
+				main_view.setVisibility(View.GONE);
 			} else {
 				main_voltage_view.setText(AltosDroid.number("%4.2f V", state.main_voltage));
-				main_voltage_view.setVisibility(View.VISIBLE);
-				main_voltage_label.setVisibility(View.VISIBLE);
 				main_lights.set(state.main_voltage > 3.2, state.main_voltage == AltosLib.MISSING);
-				main_lights.show();
+				main_view.setVisibility(View.VISIBLE);
 			}
 		}
 	}
diff --git a/altosdroid/src/org/altusmetrum/AltosDroid/TabPad.java b/altosdroid/src/org/altusmetrum/AltosDroid/TabPad.java
index f6204547..5ff9d12b 100644
--- a/altosdroid/src/org/altusmetrum/AltosDroid/TabPad.java
+++ b/altosdroid/src/org/altusmetrum/AltosDroid/TabPad.java
@@ -22,25 +22,25 @@ import org.altusmetrum.altoslib_7.*;
 import android.app.Activity;
 import android.os.Bundle;
 import android.support.v4.app.Fragment;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.ImageView;
-import android.widget.TextView;
+import android.view.*;
+import android.widget.*;
 import android.location.Location;
 
 public class TabPad extends AltosDroidTab {
 	private TextView battery_voltage_view;
 	private GoNoGoLights battery_lights;
 
+	private TableRow receiver_row;
 	private TextView receiver_voltage_view;
 	private TextView receiver_voltage_label;
 	private GoNoGoLights receiver_voltage_lights;
 
+	private TableRow apogee_row;
 	private TextView apogee_voltage_view;
 	private TextView apogee_voltage_label;
 	private GoNoGoLights apogee_lights;
 
+	private TableRow main_row;
 	private TextView main_voltage_view;
 	private TextView main_voltage_label;
 	private GoNoGoLights main_lights;
@@ -58,6 +58,7 @@ public class TabPad extends AltosDroidTab {
 	private TextView receiver_longitude_view;
 	private TextView receiver_altitude_view;
 
+	private TableRow[] ignite_row = new TableRow[4];
 	private TextView[] ignite_voltage_view = new TextView[4];
 	private TextView[] ignite_voltage_label = new TextView[4];
 	private GoNoGoLights[] ignite_lights = new GoNoGoLights[4];
@@ -71,18 +72,21 @@ public class TabPad extends AltosDroidTab {
 		                                  (ImageView) v.findViewById(R.id.battery_greenled),
 		                                  getResources());
 
+		receiver_row = (TableRow) v.findViewById(R.id.receiver_row);
 		receiver_voltage_view = (TextView) v.findViewById(R.id.receiver_voltage_value);
 		receiver_voltage_label = (TextView) v.findViewById(R.id.receiver_voltage_label);
 		receiver_voltage_lights = new GoNoGoLights((ImageView) v.findViewById(R.id.receiver_redled),
 							   (ImageView) v.findViewById(R.id.receiver_greenled),
 							   getResources());
 
+		apogee_row = (TableRow) v.findViewById(R.id.apogee_row);
 		apogee_voltage_view = (TextView) v.findViewById(R.id.apogee_voltage_value);
 		apogee_voltage_label = (TextView) v.findViewById(R.id.apogee_voltage_label);
 		apogee_lights = new GoNoGoLights((ImageView) v.findViewById(R.id.apogee_redled),
 		                                 (ImageView) v.findViewById(R.id.apogee_greenled),
 		                                 getResources());
 
+		main_row = (TableRow) v.findViewById(R.id.main_row);
 		main_voltage_view = (TextView) v.findViewById(R.id.main_voltage_value);
 		main_voltage_label = (TextView) v.findViewById(R.id.main_voltage_label);
 		main_lights = new GoNoGoLights((ImageView) v.findViewById(R.id.main_redled),
@@ -105,35 +109,40 @@ public class TabPad extends AltosDroidTab {
 		                                   getResources());
 
 		for (int i = 0; i < 4; i++) {
-			int view_id, label_id, lights_id;
+			int row_id, view_id, label_id, lights_id;
 			int red_id, green_id;
 			switch (i) {
 			case 0:
 			default:
+				row_id = R.id.ignite_a_row;
 				view_id = R.id.ignite_a_voltage_value;
 				label_id = R.id.ignite_a_voltage_label;
 				red_id = R.id.ignite_a_redled;
 				green_id = R.id.ignite_a_greenled;
 				break;
 			case 1:
+				row_id = R.id.ignite_b_row;
 				view_id = R.id.ignite_b_voltage_value;
 				label_id = R.id.ignite_b_voltage_label;
 				red_id = R.id.ignite_b_redled;
 				green_id = R.id.ignite_b_greenled;
 				break;
 			case 2:
+				row_id = R.id.ignite_c_row;
 				view_id = R.id.ignite_c_voltage_value;
 				label_id = R.id.ignite_c_voltage_label;
 				red_id = R.id.ignite_c_redled;
 				green_id = R.id.ignite_c_greenled;
 				break;
 			case 3:
+				row_id = R.id.ignite_d_row;
 				view_id = R.id.ignite_d_voltage_value;
 				label_id = R.id.ignite_d_voltage_label;
 				red_id = R.id.ignite_d_redled;
 				green_id = R.id.ignite_d_greenled;
 				break;
 			}
+			ignite_row[i] = (TableRow) v.findViewById(row_id);
 			ignite_voltage_view[i] = (TextView) v.findViewById(view_id);
 			ignite_voltage_label[i] = (TextView) v.findViewById(label_id);
 			ignite_lights[i] = new GoNoGoLights((ImageView) v.findViewById(red_id),
@@ -154,21 +163,17 @@ public class TabPad extends AltosDroidTab {
 			battery_voltage_view.setText(AltosDroid.number(" %4.2f V", state.battery_voltage));
 			battery_lights.set(state.battery_voltage >= AltosLib.ao_battery_good, state.battery_voltage == AltosLib.MISSING);
 			if (state.apogee_voltage == AltosLib.MISSING) {
-				apogee_voltage_view.setVisibility(View.GONE);
-				apogee_voltage_label.setVisibility(View.GONE);
+				apogee_row.setVisibility(View.GONE);
 			} else {
 				apogee_voltage_view.setText(AltosDroid.number(" %4.2f V", state.apogee_voltage));
-				apogee_voltage_view.setVisibility(View.VISIBLE);
-				apogee_voltage_label.setVisibility(View.VISIBLE);
+				apogee_row.setVisibility(View.VISIBLE);
 			}
 			apogee_lights.set(state.apogee_voltage >= AltosLib.ao_igniter_good, state.apogee_voltage == AltosLib.MISSING);
 			if (state.main_voltage == AltosLib.MISSING) {
-				main_voltage_view.setVisibility(View.GONE);
-				main_voltage_label.setVisibility(View.GONE);
+				main_row.setVisibility(View.GONE);
 			} else {
 				main_voltage_view.setText(AltosDroid.number(" %4.2f V", state.main_voltage));
-				main_voltage_view.setVisibility(View.VISIBLE);
-				main_voltage_label.setVisibility(View.VISIBLE);
+				main_row.setVisibility(View.VISIBLE);
 			}
 			main_lights.set(state.main_voltage >= AltosLib.ao_igniter_good, state.main_voltage == AltosLib.MISSING);
 
@@ -177,12 +182,10 @@ public class TabPad extends AltosDroidTab {
 			for (int i = 0; i < 4; i++) {
 				double voltage = i >= num_igniter ? AltosLib.MISSING : state.ignitor_voltage[i];
 				if (voltage == AltosLib.MISSING) {
-					ignite_voltage_view[i].setVisibility(View.GONE);
-					ignite_voltage_label[i].setVisibility(View.GONE);
+					ignite_row[i].setVisibility(View.GONE);
 				} else {
 					ignite_voltage_view[i].setText(AltosDroid.number(" %4.2f V", voltage));
-					ignite_voltage_view[i].setVisibility(View.VISIBLE);
-					ignite_voltage_label[i].setVisibility(View.VISIBLE);
+					ignite_row[i].setVisibility(View.VISIBLE);
 				}
 				ignite_lights[i].set(voltage >= AltosLib.ao_igniter_good, voltage == AltosLib.MISSING);
 			}
@@ -215,12 +218,10 @@ public class TabPad extends AltosDroidTab {
 
 		if (telem_state != null) {
 			if (telem_state.receiver_battery == AltosLib.MISSING) {
-				receiver_voltage_view.setVisibility(View.GONE);
-				receiver_voltage_label.setVisibility(View.GONE);
+				receiver_row.setVisibility(View.GONE);
 			} else {
 				receiver_voltage_view.setText(AltosDroid.number(" %4.2f V", telem_state.receiver_battery));
-				receiver_voltage_view.setVisibility(View.VISIBLE);
-				receiver_voltage_label.setVisibility(View.VISIBLE);
+				receiver_row.setVisibility(View.VISIBLE);
 			}
 			receiver_voltage_lights.set(telem_state.receiver_battery >= AltosLib.ao_battery_good, telem_state.receiver_battery == AltosLib.MISSING);
 		}
-- 
cgit v1.2.3