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 22:31:23 +01:00
commit b1336aee59
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
OsmAnd/src/net/osmand/plus/OsmandSettings.java
View file

@ -823,9 +823,9 @@ public class OsmandSettings {
{
SHOW_LANES.setModeDefaultValue(ApplicationMode.DEFAULT, false);
}
public final OsmandPreference<Boolean> SPEAK_STREET_NAMES = new BooleanPreference("speak_street_names", true).makeProfile().cache();
public final OsmandPreference<Boolean> SPEAK_TRAFFIC_WARNINGS = new BooleanPreference("speak_traffic_warnings", true).makeProfile().cache();
public final OsmandPreference<Boolean> SPEAK_PEDESTRIAN = new BooleanPreference("speak_pedestrian", true).makeProfile().cache();
public final OsmandPreference<Boolean> SPEAK_STREET_NAMES = new BooleanPreference("speak_street_names", true).makeProfile().cache();
public final OsmandPreference<Boolean> SPEAK_SPEED_CAMERA = new BooleanPreference("speak_cameras", true).makeProfile().cache();
public final OsmandPreference<Boolean> SPEAK_SPEED_LIMIT = new BooleanPreference("speak_speed_limit", true).makeProfile().cache();

8
OsmAnd/src/net/osmand/plus/activities/SettingsNavigationActivity.java
View file

@ -334,14 +334,14 @@ public class SettingsNavigationActivity extends SettingsBaseActivity {
return true;
} else if (preference == speakAlarms) {
showBooleanSettings(new String[] { getString(R.string.speak_street_names), getString(R.string.speak_traffic_warnings),
getString(R.string.speak_pedestrian),
getString(R.string.speak_speed_limit), getString(R.string.speak_cameras),
getString(R.string.speak_pedestrian), getString(R.string.speak_cameras),
getString(R.string.speak_speed_limit),
getString(R.string.announce_gpx_waypoints),
getString(R.string.speak_favorites),
getString(R.string.speak_poi)},
new OsmandPreference[] { settings.SPEAK_STREET_NAMES, settings.SPEAK_TRAFFIC_WARNINGS,
settings.SPEAK_PEDESTRIAN,
settings.SPEAK_SPEED_LIMIT, settings.SPEAK_SPEED_CAMERA,
settings.SPEAK_PEDESTRIAN, settings.SPEAK_SPEED_CAMERA,
settings.SPEAK_SPEED_LIMIT,
settings.ANNOUNCE_WPT, settings.ANNOUNCE_NEARBY_FAVORITES, settings.ANNOUNCE_NEARBY_POI}, preference.getTitle());
return true;
}