Merge remote-tracking branch 'origin/master'
This commit is contained in:
commit
5929cdb814
1 changed files with 2 additions and 0 deletions
|
@ -1151,6 +1151,7 @@ public class OsMoGroupsActivity extends OsmandExpandableListActivity implements
|
|||
icon.setVisibility(View.INVISIBLE);
|
||||
label.setTypeface(Typeface.DEFAULT, Typeface.ITALIC);
|
||||
label.setText(model.getVisibleName());
|
||||
labelTime.setText("");
|
||||
} else if (location == null || mapLocation == null) {
|
||||
label.setTypeface(Typeface.DEFAULT, Typeface.NORMAL);
|
||||
icon.setVisibility(View.VISIBLE);
|
||||
|
@ -1163,6 +1164,7 @@ public class OsMoGroupsActivity extends OsmandExpandableListActivity implements
|
|||
draw.setColor(model.isEnabled() ? activeColor : color);
|
||||
icon.setImageDrawable(draw);
|
||||
label.setText(model.getVisibleName());
|
||||
labelTime.setText("");
|
||||
} else {
|
||||
label.setTypeface(Typeface.DEFAULT, Typeface.NORMAL);
|
||||
icon.setVisibility(View.VISIBLE);
|
||||
|
|
Loading…
Reference in a new issue