Preparations

OsmAnd/res/values/strings.xml

@@ -9,6 +9,10 @@
          1. All your modified/created strings are in the top of the file (to make easier find what's translated).
     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="avoid_in_routing_title">Avoid..</string>
+    <string name="avoid_in_routing_descr">Avoid toll roads, unpaved, ferries</string>
+    <string name="show_warnings_title">Show alarms</string>
+    <string name="show_warnings_descr">Show speed limits, speed cameras and traffic bumps</string>
     <string name="map_widget_fluorescent">Fluorescent colors</string>
     <string name="map_widget_show_ruler">Ruler</string>
     <string name="map_widget_appearance">Appearance</string>
@@ -16,8 +20,8 @@
     <string name="map_widget_transparent">Transparent views</string>
     <string name="monitoring_mode_off">GPX rec</string>
     <string name="monitoring_mode_on">GPX off</string>
-    <string name="bg_service_sleep_mode_off">Stop background</string>
+    <string name="bg_service_sleep_mode_off">Run in background</string>
-    <string name="bg_service_sleep_mode_on">Run in background</string>
+    <string name="bg_service_sleep_mode_on">Stop background</string>
     <string name="gps_wakeup_interval">GPS wakeup interval : %s</string>
     <string name="int_continuosly">Continuously</string>
     <string name="screen_is_locked">To unlock screen press lock icon</string>

OsmAnd/res/xml/settings_pref.xml

@@ -21,6 +21,8 @@
 			<ListPreference android:title="@string/voice_provider" android:key="voice_provider" android:summary="@string/voice_provider_descr"></ListPreference>
 			<ListPreference android:key="auto_follow_route" android:title="@string/choose_auto_follow_route"
 				android:summary="@string/choose_auto_follow_route_descr"></ListPreference>
+			<CheckBoxPreference android:title="@string/auto_zoom_map" android:summary="@string/auto_zoom_map_descr" android:key="auto_zoom_map"></CheckBoxPreference>
+			
 						<CheckBoxPreference android:summary="@string/show_speed_limits_descr" android:title="@string/show_speed_limits"
 				android:key="show_speed_limits"></CheckBoxPreference>
 			<CheckBoxPreference android:summary="@string/show_cameras_descr" android:title="@string/show_cameras"
@@ -28,6 +30,10 @@
 			<CheckBoxPreference android:title="@string/auto_zoom_map" android:summary="@string/auto_zoom_map_descr" android:key="auto_zoom_map"></CheckBoxPreference>
 			<CheckBoxPreference android:summary="@string/avoid_toll_roads_descr" android:title="@string/avoid_toll_roads"
 				android:key="avoid_toll_roads"></CheckBoxPreference>
+			<!-- 
+			<Preference android:title="@string/show_warnings_title" android:summary="@string/show_warnings_descr" android:key="show_routing_alarms"/>
+			<Preference android:title="@string/avoid_in_routing_title" android:summary="@string/avoid_in_routing_descr" android:key="avoid_in_routing"/>
+			 -->
 			<CheckBoxPreference android:summary="@string/use_compass_navigation_descr" android:title="@string/use_compass_navigation"
 				android:key="use_compass_navigation"></CheckBoxPreference>
 		</PreferenceScreen>

OsmAnd/src/net/osmand/plus/views/MapInfoControls.java

@@ -22,7 +22,7 @@ public class MapInfoControls {
 	public static final int RIGHT_CONTROL = 1;
 	public static final int MAIN_CONTROL = 0;
 	
-	private Set<MapInfoControlRegInfo> appearanceWidgets = new TreeSet<MapInfoControls.MapInfoControlRegInfo>();
+	private Set<MapInfoControlRegInfo> appearanceWidgets = new LinkedHashSet<MapInfoControls.MapInfoControlRegInfo>();
 	private Set<MapInfoControlRegInfo> left = new TreeSet<MapInfoControls.MapInfoControlRegInfo>();
 	private Set<MapInfoControlRegInfo> right = new TreeSet<MapInfoControls.MapInfoControlRegInfo>();
 	private Set<MapInfoControlRegInfo> top = new TreeSet<MapInfoControls.MapInfoControlRegInfo>(new Comparator<MapInfoControlRegInfo>() {