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 2014-12-20 17:39:21 +01:00
commit a90620c30c
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
OsmAnd/src/net/osmand/plus/helpers/WaypointHelper.java
View file

@ -678,9 +678,9 @@ public class WaypointHelper {
//assign alarm list icons manually for now
//attention, some list icons are only temporary test icons, not pixel perfect yet.
if(((AlarmInfo) point).getType().toString() == "SPEED_CAMERA") {
return uiCtx.getResources().getDrawable(R.drawable.mx_highway_speed_camera);
return R.drawable.mx_highway_speed_camera;
} else if(((AlarmInfo) point).getType().toString() == "BORDER_CONTROL") {
R.drawable.mx_barrier_border_control;
return R.drawable.mx_barrier_border_control;
} else if(((AlarmInfo) point).getType().toString() == "RAILWAY") {
//this produces error: non-static variable app cannot be referenced from a static context
//if(app.getSettings.DRIVING_REGION.get().americanSigns){