Android-builders-club/OsmAnd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse source
This commit is contained in:
Weblate 2015-08-04 20:32:13 +02:00
commit 38df287af0
1 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
OsmAnd/src/net/osmand/plus/views/mapwidgets/RouteInfoWidgetsFactory.java
View file

@ -834,7 +834,11 @@ public class RouteInfoWidgetsFactory {
} else if(alarm.getType() == AlarmInfoType.BORDER_CONTROL) { } else if(alarm.getType() == AlarmInfoType.BORDER_CONTROL) {
locimgId = R.drawable.warnings_border_control; locimgId = R.drawable.warnings_border_control;
} else if(alarm.getType() == AlarmInfoType.HAZARD) { } 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) { } else if(alarm.getType() == AlarmInfoType.TOLL_BOOTH) {
//image done by drawing red ring //image done by drawing red ring
} else if(alarm.getType() == AlarmInfoType.TRAFFIC_CALMING) { } else if(alarm.getType() == AlarmInfoType.TRAFFIC_CALMING) {