projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Update java library versions
[fw/altos]
/
altosdroid
/
src
/
org
/
altusmetrum
/
AltosDroid
/
TabPad.java
diff --git
a/altosdroid/src/org/altusmetrum/AltosDroid/TabPad.java
b/altosdroid/src/org/altusmetrum/AltosDroid/TabPad.java
index 5ff9d12bbc17ebfa1fd1ec718dab98324257256c..f5fbaf61ba710205897692a611942093956fa7e6 100644
(file)
--- a/
altosdroid/src/org/altusmetrum/AltosDroid/TabPad.java
+++ b/
altosdroid/src/org/altusmetrum/AltosDroid/TabPad.java
@@
-17,7
+17,7
@@
package org.altusmetrum.AltosDroid;
package org.altusmetrum.AltosDroid;
-import org.altusmetrum.altoslib_
7
.*;
+import org.altusmetrum.altoslib_
9
.*;
import android.app.Activity;
import android.os.Bundle;
import android.app.Activity;
import android.os.Bundle;
@@
-191,9
+191,9
@@
public class TabPad extends AltosDroidTab {
}
if (state.flight != 0) {
}
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");
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");
data_logging_view.setText("Recording data");
else
data_logging_view.setText("Recorded data");