X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=altosdroid%2Fsrc%2Forg%2Faltusmetrum%2FAltosDroid%2FTabPad.java;h=492f7f5f4585c61dffb703c5189fd4802423bbd2;hb=1085ec5d57e0ed5d132f2bbdac1a0b6a32c0ab4a;hp=5ff9d12bbc17ebfa1fd1ec718dab98324257256c;hpb=c4af5cb233013b35d6763f5adf8d11b47f847111;p=fw%2Faltos diff --git a/altosdroid/src/org/altusmetrum/AltosDroid/TabPad.java b/altosdroid/src/org/altusmetrum/AltosDroid/TabPad.java index 5ff9d12b..492f7f5f 100644 --- a/altosdroid/src/org/altusmetrum/AltosDroid/TabPad.java +++ b/altosdroid/src/org/altusmetrum/AltosDroid/TabPad.java @@ -3,7 +3,8 @@ * * 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. + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. * * This program is distributed in the hope that it will be useful, but * WITHOUT ANY WARRANTY; without even the implied warranty of @@ -17,7 +18,7 @@ package org.altusmetrum.AltosDroid; -import org.altusmetrum.altoslib_7.*; +import org.altusmetrum.altoslib_11.*; import android.app.Activity; import android.os.Bundle; @@ -191,9 +192,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");