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/TabPad.java | |
| parent | 489d22f448d9927533e90da4d16c5a332a234a8d (diff) | |
| parent | 73ce3f73526edfabccd3b98e6e67de6d82a84b63 (diff) | |
Merge branch 'master' into branch-1.6
Diffstat (limited to 'altosdroid/src/org/altusmetrum/AltosDroid/TabPad.java')
| -rw-r--r-- | altosdroid/src/org/altusmetrum/AltosDroid/TabPad.java | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/altosdroid/src/org/altusmetrum/AltosDroid/TabPad.java b/altosdroid/src/org/altusmetrum/AltosDroid/TabPad.java index 4d04316f..f5fbaf61 100644 --- a/altosdroid/src/org/altusmetrum/AltosDroid/TabPad.java +++ b/altosdroid/src/org/altusmetrum/AltosDroid/TabPad.java @@ -17,7 +17,7 @@ package org.altusmetrum.AltosDroid; -import org.altusmetrum.altoslib_8.*; +import org.altusmetrum.altoslib_9.*; import android.app.Activity; import android.os.Bundle; @@ -191,9 +191,9 @@ public class TabPad extends AltosDroidTab { } if (state.flight != 0) { - if (state.state <= AltosLib.ao_flight_pad) + if (state.state() <= AltosLib.ao_flight_pad) data_logging_view.setText("Ready to record"); - else if (state.state < AltosLib.ao_flight_landed) + else if (state.state() < AltosLib.ao_flight_landed) data_logging_view.setText("Recording data"); else data_logging_view.setText("Recorded data"); |