projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altosui: Add config and pyro tabs to graph widget
[fw/altos]
/
altosdroid
/
app
/
src
/
main
/
java
/
org
/
altusmetrum
/
AltosDroid
/
IgniterActivity.java
diff --git
a/altosdroid/app/src/main/java/org/altusmetrum/AltosDroid/IgniterActivity.java
b/altosdroid/app/src/main/java/org/altusmetrum/AltosDroid/IgniterActivity.java
index 9e5a14ed82e65eee708441d2d09c9d04048f4e46..752558206accf3f89d3880d9c95d3cf1fbb68a48 100644
(file)
--- a/
altosdroid/app/src/main/java/org/altusmetrum/AltosDroid/IgniterActivity.java
+++ b/
altosdroid/app/src/main/java/org/altusmetrum/AltosDroid/IgniterActivity.java
@@
-29,7
+29,7
@@
import android.view.*;
import android.view.View.*;
import android.widget.*;
import android.view.View.*;
import android.widget.*;
-import org.altusmetrum.altoslib_1
3
.*;
+import org.altusmetrum.altoslib_1
4
.*;
class IgniterItem {
public String name;
class IgniterItem {
public String name;
@@
-101,7
+101,7
@@
class IgniterAdapter extends ArrayAdapter<IgniterItem> {
if (position == selected_item)
item.igniter_view.setBackgroundColor(Color.RED);
else
if (position == selected_item)
item.igniter_view.setBackgroundColor(Color.RED);
else
- item.igniter_view.setBackgroundColor(
Color.BLACK
);
+ item.igniter_view.setBackgroundColor(
0
);
return item.igniter_view;
}
}
return item.igniter_view;
}
}
@@
-139,7
+139,8
@@
public class IgniterActivity extends Activity {
switch (msg.what) {
case AltosDroid.MSG_IGNITER_STATUS:
switch (msg.what) {
case AltosDroid.MSG_IGNITER_STATUS:
- ia.igniter_status((HashMap <String,Integer>) msg.obj);
+ @SuppressWarnings("unchecked") HashMap<String,Integer> map = (HashMap <String,Integer>) msg.obj;
+ ia.igniter_status(map);
break;
}
}
break;
}
}
@@
-339,10
+340,10
@@
public class IgniterActivity extends Activity {
@Override
protected void onCreate(Bundle savedInstanceState) {
@Override
protected void onCreate(Bundle savedInstanceState) {
+ setTheme(AltosDroid.dialog_themes[AltosDroidPreferences.font_size()]);
super.onCreate(savedInstanceState);
// Setup the window
super.onCreate(savedInstanceState);
// Setup the window
- requestWindowFeature(Window.FEATURE_INDETERMINATE_PROGRESS);
setContentView(R.layout.igniters);
igniters_view = (ListView) findViewById(R.id.igniters);
setContentView(R.layout.igniters);
igniters_view = (ListView) findViewById(R.id.igniters);