Merge remote-tracking branch 'origin/master'

This commit is contained in:
Weblate 2015-08-04 20:32:13 +02:00
commit 38df287af0

View file

@ -834,7 +834,11 @@ public class RouteInfoWidgetsFactory {
} else if(alarm.getType() == AlarmInfoType.BORDER_CONTROL) {
locimgId = R.drawable.warnings_border_control;
} else if(alarm.getType() == AlarmInfoType.HAZARD) {
locimgId = R.drawable.warnings_hazard;
if(settings.DRIVING_REGION.get().americanSigns){
locimgId = R.drawable.warnings_hazard_us;
} else {
locimgId = R.drawable.warnings_hazard;
}
} else if(alarm.getType() == AlarmInfoType.TOLL_BOOTH) {
//image done by drawing red ring
} else if(alarm.getType() == AlarmInfoType.TRAFFIC_CALMING) {