Merge branch 'dev' into newautosens
This commit is contained in:
commit
150ef1a8bc
2 changed files with 2 additions and 2 deletions
|
@ -247,7 +247,7 @@ public class Profile {
|
|||
}
|
||||
|
||||
public String getIcList() {
|
||||
return getValuesList(ic, null, new DecimalFormat("0.0"), getUnits() + "/U");
|
||||
return getValuesList(ic, null, new DecimalFormat("0.0"), " g/U");
|
||||
}
|
||||
|
||||
public Double getBasal() {
|
||||
|
|
|
@ -162,7 +162,7 @@ public class DanaRHistoryActivity extends Activity {
|
|||
}
|
||||
});
|
||||
clearCardView();
|
||||
((DanaRInterface)pump).loadHistory(RecordTypes.RECORD_TYPE_DAILY);
|
||||
((DanaRInterface)pump).loadHistory(selected.type);
|
||||
loadDataFromDB(selected.type);
|
||||
runOnUiThread(new Runnable() {
|
||||
@Override
|
||||
|
|
Loading…
Reference in a new issue