diff options
| author | Bdale Garbee <bdale@gag.com> | 2016-01-10 19:04:49 -0700 |
|---|---|---|
| committer | Bdale Garbee <bdale@gag.com> | 2016-01-10 19:04:49 -0700 |
| commit | 70e9064ca962dfd345f8a342afa130f969606553 (patch) | |
| tree | e8e374912df403e7e237aecbd1ec0a19fa6c5c42 /altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java | |
| parent | 489d22f448d9927533e90da4d16c5a332a234a8d (diff) | |
| parent | 73ce3f73526edfabccd3b98e6e67de6d82a84b63 (diff) | |
Merge branch 'master' into branch-1.6
Diffstat (limited to 'altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java')
| -rw-r--r-- | altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java b/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java index 3a07212a..b26a9bc8 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_8.*; +import org.altusmetrum.altoslib_9.*; 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()); |