projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altosdroid: Save selected map type in AltosDroid object
[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 6c6566ba63573f07bdd33122c602439c95a63441..5be9ba84429f38190e9d5038648fa85eab453600 100644
(file)
--- a/
altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java
+++ b/
altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java
@@
-76,6
+76,8
@@
public class AltosDroid extends FragmentActivity implements AltosUnitsListener {
public static final int REQUEST_PRELOAD_MAPS = 3;
public static final int REQUEST_MAP_TYPE = 4;
public static final int REQUEST_PRELOAD_MAPS = 3;
public static final int REQUEST_MAP_TYPE = 4;
+ public int map_type = AltosMap.maptype_hybrid;
+
public static FragmentManager fm;
private BluetoothAdapter mBluetoothAdapter = null;
public static FragmentManager fm;
private BluetoothAdapter mBluetoothAdapter = null;
@@
-677,12
+679,13
@@
public class AltosDroid extends FragmentActivity implements AltosUnitsListener {
}
private void set_map_type(Intent data) {
}
private void set_map_type(Intent data) {
- int
mod
e = data.getIntExtra(MapTypeActivity.EXTRA_MAP_TYPE, -1);
+ int
typ
e = data.getIntExtra(MapTypeActivity.EXTRA_MAP_TYPE, -1);
- AltosDebug.debug("intent set_map_type %d\n", mode);
- if (mode != -1) {
+ AltosDebug.debug("intent set_map_type %d\n", type);
+ if (type != -1) {
+ map_type = type;
for (AltosDroidTab mTab : mTabs)
for (AltosDroidTab mTab : mTabs)
- mTab.set_map_type(m
od
e);
+ mTab.set_map_type(m
ap_typ
e);
}
}
}
}