projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altoslib: Clean up remaining direct AltosState.state users
[fw/altos]
/
altosdroid
/
src
/
org
/
altusmetrum
/
AltosDroid
/
AltosDroid.java
diff --git
a/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java
b/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java
index 3a07212a226312995d2d939a4f5ca039b1428a86..1a27e4ebe66d195077c8273bbc5c145063c16277 100644
(file)
--- a/
altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java
+++ b/
altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java
@@
-386,12
+386,12
@@
public class AltosDroid extends FragmentActivity implements AltosUnitsListener {
AltosGreatCircle from_receiver = null;
if (saved_state != null)
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 != 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;
boolean prev_locked = false;
boolean locked = false;
@@
-408,9
+408,9
@@
public class AltosDroid extends FragmentActivity implements AltosUnitsListener {
}
}
} else {
}
}
} else {
- if (prev_state != state.state) {
+ if (prev_state != state.state
()
) {
String currentTab = mTabHost.getCurrentTabTag();
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;
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));
}
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());
mStateLayout.setVisibility(View.GONE);
} else {
mStateView.setText(state.state_name());