X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=altosdroid%2Fsrc%2Forg%2Faltusmetrum%2FAltosDroid%2FAltosDroid.java;h=f317f31da5803b5002fff50e2743e44a00390920;hb=21d176f161b90f18f236ef887cef9676d712eee3;hp=d351378d6c2bb0da256cb2c78c30bf111527c94e;hpb=2997c9720f58b2955925e4e99c11a6ec302114a9;p=fw%2Faltos

diff --git a/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java b/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java
index d351378d..f317f31d 100644
--- a/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java
+++ b/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java
@@ -49,7 +49,7 @@ import android.hardware.usb.*;
 import android.graphics.*;
 import android.graphics.drawable.*;
 
-import org.altusmetrum.altoslib_7.*;
+import org.altusmetrum.altoslib_10.*;
 
 public class AltosDroid extends FragmentActivity implements AltosUnitsListener {
 
@@ -386,12 +386,12 @@ public class AltosDroid extends FragmentActivity implements AltosUnitsListener {
 		AltosGreatCircle from_receiver = null;
 
 		if (saved_state != null)
-			prev_state = saved_state.state;
+			prev_state = saved_state.state();
 
 		if (state != null) {
 			set_screen_on(state_age(state));
 
-			if (state.state == AltosLib.ao_flight_stateless) {
+			if (state.state() == AltosLib.ao_flight_stateless) {
 				boolean	prev_locked = false;
 				boolean locked = false;
 
@@ -408,9 +408,9 @@ public class AltosDroid extends FragmentActivity implements AltosUnitsListener {
 					}
 				}
 			} else {
-				if (prev_state != state.state) {
+				if (prev_state != state.state()) {
 					String currentTab = mTabHost.getCurrentTabTag();
-					switch (state.state) {
+					switch (state.state()) {
 					case AltosLib.ao_flight_boost:
 						if (currentTab.equals(tab_pad_name)) mTabHost.setCurrentTabByTag(tab_flight_name);
 						break;
@@ -448,8 +448,8 @@ public class AltosDroid extends FragmentActivity implements AltosUnitsListener {
 				else
 					mFlightView.setText(String.format("%d", state.flight));
 			}
-			if (saved_state == null || state.state != saved_state.state) {
-				if (state.state == AltosLib.ao_flight_stateless) {
+			if (saved_state == null || state.state() != saved_state.state()) {
+				if (state.state() == AltosLib.ao_flight_stateless) {
 					mStateLayout.setVisibility(View.GONE);
 				} else {
 					mStateView.setText(state.state_name());
@@ -860,13 +860,17 @@ public class AltosDroid extends FragmentActivity implements AltosUnitsListener {
 	void touch_trackers(Integer[] serials) {
 		AlertDialog.Builder builder_tracker = new AlertDialog.Builder(this);
 		builder_tracker.setTitle("Select Tracker");
-		final String[] trackers = new String[serials.length];
+		final String[] trackers = new String[serials.length + 1];
+		trackers[0] = "Auto";
 		for (int i = 0; i < serials.length; i++)
-			trackers[i] = String.format("%d", serials[i]);
+			trackers[i+1] = String.format("%d", serials[i]);
 		builder_tracker.setItems(trackers,
 					 new DialogInterface.OnClickListener() {
 						 public void onClick(DialogInterface dialog, int item) {
-							 select_tracker(Integer.parseInt(trackers[item]));
+							 if (item == 0)
+								 select_tracker(0);
+							 else
+								 select_tracker(Integer.parseInt(trackers[item]));
 						 }
 					 });
 		AlertDialog alert_tracker = builder_tracker.create();