Merge remote-tracking branch 'origin/master'

This commit is contained in:
Weblate 2014-09-11 22:13:51 +02:00
commit 1ecb0c7225
3 changed files with 2 additions and 1 deletions

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.8 KiB

After

Width:  |  Height:  |  Size: 1.6 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.5 KiB

After

Width:  |  Height:  |  Size: 3.2 KiB

View file

@ -681,6 +681,7 @@ public class RouteInfoWidgetsFactory {
text = "";
} else if(alarm.getType() == AlarmInfoType.BORDER_CONTROL) {
locimgId = R.drawable.warnings_border_control;
text = "";
//text = "CLO";
} else if(alarm.getType() == AlarmInfoType.TOLL_BOOTH) {
text = "$";
@ -689,8 +690,8 @@ public class RouteInfoWidgetsFactory {
text = "";
} else if(alarm.getType() == AlarmInfoType.STOP) {
locimgId = R.drawable.warnings_stop_sign;
text = "";
//text = "STOP";
//text = "";
}
visible = (text != null && text.length() > 0) || locimgId != 0;
if (visible) {