Merge remote-tracking branch 'origin/master'

This commit is contained in:
Weblate 2015-11-23 08:57:53 +01:00
commit 815fdc2df5

View file

@ -849,6 +849,7 @@ public class RouteInfoWidgetsFactory {
} }
} else if(alarm.getType() == AlarmInfoType.TOLL_BOOTH) { } else if(alarm.getType() == AlarmInfoType.TOLL_BOOTH) {
//image done by drawing red ring //image done by drawing red ring
text = "$";
} else if(alarm.getType() == AlarmInfoType.TRAFFIC_CALMING) { } else if(alarm.getType() == AlarmInfoType.TRAFFIC_CALMING) {
if(settings.DRIVING_REGION.get().americanSigns){ if(settings.DRIVING_REGION.get().americanSigns){
locimgId = R.drawable.warnings_traffic_calming_us; locimgId = R.drawable.warnings_traffic_calming_us;