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

clean up alarm menu. (But speed_bump arning still not implemented)

Browse source
This commit is contained in:
sonora 2012-09-02 13:33:36 +02:00
parent 298b13890a
commit a0b55e6787
4 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
OsmAnd/res/values-de/strings.xml
View file

@ -1,5 +1,7 @@
<?xml version='1.0' encoding='utf-8'?>
<resources>
<string name="show_warnings_title">Warnungen anzeigen…</string>
<string name="show_warnings_descr">Warnungen für Tempolimits, stationäre Radarfallen, Rüttelschwellen, weiterführende Fahrspuren</string>
<string name="use_compass_navigation_descr">Verwende Kompass, wenn keine andere Richtungsbestimmung möglich</string>
<string name="use_compass_navigation">Kompass verwenden</string>
<string name="avoid_motorway">Vermeide Autobahnen</string>
@ -1107,8 +1109,6 @@
<string name="avoid_ferries">Vermeide Fähren</string>
<string name="avoid_in_routing_title">Vermeide…</string>
<string name="avoid_in_routing_descr">Mautstraßen, Fähren und ungeteerte Straßen vermeiden</string>
<string name="show_warnings_title">Warnungen anzeigen…</string>
<string name="show_warnings_descr">Warnungen für stationäre Radarfallen, Tempolimits und Rüttelschwellen</string>
<string name="map_widget_fluorescent">Routen in Leuchtfarbe</string>
<string name="map_widget_show_ruler">Maßstab</string>
<string name="map_widget_appearance">Verschiedenes:</string>

4
OsmAnd/res/values/strings.xml
View file

@ -10,6 +10,8 @@
PLEASE: Have a look at http://code.google.com/p/osmand/wiki/UIConsistency, it may really improve your and our work :-) Thx - Hardy
-->
<string name="show_warnings_title">Show alarms&#8230;</string>
<string name="show_warnings_descr">Show speed limits, speed cameras, speed bumps, lane info</string>
<string name="use_compass_navigation_descr">Use the compass when no heading is detected otherwise</string>
<string name="use_compass_navigation">Use compass</string>
<string name="avoid_motorway">Avoid motorways</string>
@ -104,8 +106,6 @@
<string name="avoid_ferries">Avoid ferries</string>
<string name="avoid_in_routing_title">Avoid&#8230;</string>
<string name="avoid_in_routing_descr">Avoid toll roads, unpaved, ferries</string>
<string name="show_warnings_title">Show alarms&#8230;</string>
<string name="show_warnings_descr">Show speed limits, speed cameras, and traffic bumps</string>
<string name="map_widget_fluorescent">Fluorescent routes</string>
<string name="map_widget_show_ruler">Ruler</string>
<string name="map_widget_appearance">Miscellaneous:</string>

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

@ -592,8 +592,8 @@ public class OsmandSettings {
// this value string is synchronized with settings_pref.xml preference name
public final OsmandPreference<Boolean> FAST_ROUTE_MODE = new BooleanPreference("fast_route_mode", true).makeProfile();
public final OsmandPreference<Boolean> SHOW_CAMERAS = new BooleanPreference("show_cameras", true).makeGlobal().cache();
public final OsmandPreference<Boolean> SHOW_SPEED_LIMITS = new BooleanPreference("show_speed_limits", true).makeGlobal().cache();
public final OsmandPreference<Boolean> SHOW_CAMERAS = new BooleanPreference("show_cameras", true).makeGlobal().cache();
public final OsmandPreference<Boolean> SHOW_LANES = new BooleanPreference("show_lanes", true).makeGlobal().cache();
public final OsmandPreference<Boolean> AVOID_TOLL_ROADS = new BooleanPreference("avoid_toll_roads", false).makeGlobal().cache();

6
OsmAnd/src/net/osmand/plus/activities/SettingsActivity.java
View file

@ -751,9 +751,9 @@ public class SettingsActivity extends PreferenceActivity implements OnPreference
osmandSettings.AVOID_FERRIES, osmandSettings.AVOID_UNPAVED_ROADS, osmandSettings.AVOID_MOTORWAY });
return true;
} else if (preference == showAlarms) {
showBooleanSettings(new String[] { getString(R.string.show_cameras), getString(R.string.show_speed_limits),
getString(R.string.show_lanes) }, new OsmandPreference[] { osmandSettings.SHOW_CAMERAS,
osmandSettings.SHOW_SPEED_LIMITS, osmandSettings.SHOW_LANES });
showBooleanSettings(new String[] { getString(R.string.show_speed_limits), getString(R.string.show_cameras),
getString(R.string.show_lanes) }, new OsmandPreference[] { osmandSettings.SHOW_SPEED_LIMITS,
osmandSettings.SHOW_CAMERAS, osmandSettings.SHOW_LANES });
return true;
}
return false;