Compare commits

..

No commits in common. "0ba536e323565c135ff4bf151b586a3b123ed6e0" and "6e2a4a6aee1d691124fd64b0656eed69a5a06ea5" have entirely different histories.

2 changed files with 2 additions and 9 deletions

View File

@ -97,10 +97,6 @@ public class AlertGridViewAdapter extends BaseAdapter
switch(acknowledged.get(position) ? 1 : 0)
{
case 1:
ViewGroup.LayoutParams params = convertView.getLayoutParams();
if (params != null) {
params.height = 0;
}
view.imageViewAlert.setImageResource(R.drawable.alert_off);
//view.layoutAlarm.setBackgroundColor(0xffffffff);
break;

View File

@ -128,12 +128,9 @@ public class AlarmActivity extends Activity {
setConvertViewAlarm(arg1);
// save position
ackPosition = position;
if (!AppParams.DEMO) {
getParentTab().getAlarms(AppParams.USERID);
if (!AppParams.DEMO)
setACK(getAllAlarms().get(position).idx, getAllAlarms().get(position).type, getAllAlarms().get(position).unitName);
acknowledged.set(position, true);
updateResultsInUi(ALARM);
} else {
else {
getAllAlarms().get(position).ack = 1;
updateResultsInUi("else");
}