From 8cbb3a07b29b39a537cc48ec6e109e39d6b2c363 Mon Sep 17 00:00:00 2001 From: sonora Date: Sat, 20 Dec 2014 22:31:05 +0100 Subject: [PATCH] align menut item order --- OsmAnd/src/net/osmand/plus/OsmandSettings.java | 2 +- .../plus/activities/SettingsNavigationActivity.java | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/OsmAnd/src/net/osmand/plus/OsmandSettings.java b/OsmAnd/src/net/osmand/plus/OsmandSettings.java index 2b06c514ce..f57239dcc7 100644 --- a/OsmAnd/src/net/osmand/plus/OsmandSettings.java +++ b/OsmAnd/src/net/osmand/plus/OsmandSettings.java @@ -823,9 +823,9 @@ public class OsmandSettings { { SHOW_LANES.setModeDefaultValue(ApplicationMode.DEFAULT, false); } + public final OsmandPreference SPEAK_STREET_NAMES = new BooleanPreference("speak_street_names", true).makeProfile().cache(); public final OsmandPreference SPEAK_TRAFFIC_WARNINGS = new BooleanPreference("speak_traffic_warnings", true).makeProfile().cache(); public final OsmandPreference SPEAK_PEDESTRIAN = new BooleanPreference("speak_pedestrian", true).makeProfile().cache(); - public final OsmandPreference SPEAK_STREET_NAMES = new BooleanPreference("speak_street_names", true).makeProfile().cache(); public final OsmandPreference SPEAK_SPEED_CAMERA = new BooleanPreference("speak_cameras", true).makeProfile().cache(); public final OsmandPreference SPEAK_SPEED_LIMIT = new BooleanPreference("speak_speed_limit", true).makeProfile().cache(); diff --git a/OsmAnd/src/net/osmand/plus/activities/SettingsNavigationActivity.java b/OsmAnd/src/net/osmand/plus/activities/SettingsNavigationActivity.java index 4925b1858b..9d790f053e 100644 --- a/OsmAnd/src/net/osmand/plus/activities/SettingsNavigationActivity.java +++ b/OsmAnd/src/net/osmand/plus/activities/SettingsNavigationActivity.java @@ -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; }