diff options
| author | Bdale Garbee <bdale@gag.com> | 2016-01-10 19:09:09 -0700 |
|---|---|---|
| committer | Bdale Garbee <bdale@gag.com> | 2016-01-10 19:09:09 -0700 |
| commit | 4ecc53175a5c28cbc1b846c24d83b6adc3afc2ef (patch) | |
| tree | 4c318f3d5b7ef01247531a8ccb8ce3ce211e48b3 /altosdroid/src/org/altusmetrum/AltosDroid/TabPad.java | |
| parent | 19d25c9f4c80d2c8562fc4abd766a23961167e79 (diff) | |
| parent | a2ea621eac3263348aff50885c79296f8ece26ed (diff) | |
Merge branch 'branch-1.6' into debian
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"); |