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

bug with showAlarms status

Browse source
This commit is contained in:
sonora 2014-09-10 16:06:50 +02:00
parent 5a123ee99f
commit 0e798fb169
1 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -599,11 +599,15 @@ public class WaypointHelper {
} }
public boolean showAlarms() { public boolean showAlarms() {
return app.getSettings().SHOW_CAMERAS.get() || app.getSettings().SHOW_TRAFFIC_WARNINGS.get(); //I think here only traffic warnings other than the speed cam are needed. speed cam setting is a separate setting for explicit allow/disallow by user.
//return app.getSettings().SHOW_CAMERAS.get() || app.getSettings().SHOW_TRAFFIC_WARNINGS.get();
return app.getSettings().SHOW_TRAFFIC_WARNINGS.get();
} }
public boolean announceAlarms() { public boolean announceAlarms() {
return app.getSettings().SPEAK_SPEED_CAMERA.get() || app.getSettings().SPEAK_TRAFFIC_WARNINGS.get(); //I think here only traffic warnings other than the speed cam are needed. speed cam setting is a separate setting for explicit allow/disallow by user.
//return app.getSettings().SPEAK_SPEED_CAMERA.get() || app.getSettings().SPEAK_TRAFFIC_WARNINGS.get();
return app.getSettings().SPEAK_TRAFFIC_WARNINGS.get();
} }