Merge branch 'master' of https://github.com/osmandapp/Osmand

OsmAnd-java/build.xml

@@ -80,6 +80,12 @@
 		</exec>
 		<antcall target="jar" />
 	</target>
+	
+	<target name="native-legacy-libs-jar" depends="compile">
+		<exec command="bash collect_legacy_libs.sh" failonerror="true">
+		</exec>
+		<antcall target="jar" />
+	</target>
 
 	<target name="jar" depends="compile">
 		<manifestclasspath property="lib.list" jarfile="OsmAnd-core.jar">

OsmAnd-java/collect_legacy_libs.sh

@@ -0,0 +1,31 @@
+#!/bin/bash
+
+set -e
+
+SCRIPT_LOC="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
+CORE_LOC="$SCRIPT_LOC/../../core"
+
+if [[ "$(uname -a)" =~ Linux ]]; then
+	if [[ -z "$OSMAND_BUILD_CPU_CORES_NUM" ]]; then
+		OSMAND_BUILD_CPU_CORES_NUM=`nproc`
+	fi
+fi
+
+function copyLibs {
+	if [ -d "$CORE_LOC/binaries/$1/$2" ]; then 
+		echo "Copy binaries $1 $2";
+		cp "$CORE_LOC"/binaries/$1/$2/Release/libosmand.so bin/osmand-$1-$3.lib
+	fi
+}
+
+function compile {
+	"$CORE_LOC/externals/configure.sh"
+	if [ ! -d "$CORE_LOC/targets/amd64-linux-gcc-amd64-linux-gcc-release.baked" ]; then 
+		"$CORE_LOC/targets/amd64-linux-gcc.sh" release
+	fi
+	(cd "$CORE_LOC/targets/amd64-linux-gcc-amd64-linux-gcc-release.baked" && make -j$OSMAND_BUILD_CPU_CORES_NUM)
+}
+
+compile
+copyLibs linux amd64 amd64 so
+# copyLibs linux i686 x86 so

OsmAnd/res/values-nl/strings.xml

@@ -1863,4 +1863,7 @@ Afghanistan, Albanie, Algerije, Andorra, Angola, Anguilla, Antigua en Barbuda, A
     <string name="gpx_info_waypoints">Routepunten: %1$s </string>
 	<string name="show_zoom_buttons_navigation_descr">Zoomknoppen tonen tijdens navigeren</string>
     <string name="show_zoom_buttons_navigation">Zoomknoppen</string>
+    <string name="sort_by_distance">Sorteer op afstand</string>
+    <string name="sort_by_name">Sorteer op naam</string>
+    <string name="visible_element">Zichtbaar</string>
     </resources>

OsmAnd/res/values-sk/strings.xml

@@ -1889,4 +1889,7 @@ Afganistan, Albánsko, Alžírsko, Andora, Angola, Anguilla, Antigua a Barbuda,
     <string name="layer_amenity_label">Popisy bodov</string>
     <string name="show_zoom_buttons_navigation_descr">Zobraziť tlačidlá priblíženia počas navigácie</string>
     <string name="show_zoom_buttons_navigation">Zobraziť tlačidlá priblíženia</string>
+    <string name="sort_by_distance">Zoradiť podľa vzdialenosti</string>
+    <string name="sort_by_name">Zoradiť podľa názvu</string>
+    <string name="visible_element">Viditeľný</string>
     </resources>

OsmAnd/res/values-sv/strings.xml

@@ -1592,4 +1592,6 @@ Aktuella data på enheten (%1$s ledigt):</string>
 	
     <string name="osmodroid_unseek">Sluta söka objekt</string>
     <string name="visible_element">Synlig</string>
+    <string name="sort_by_distance">Sortera efter avstånd</string>
+    <string name="sort_by_name">Sortera efter namn</string>
     </resources>

OsmAnd/res/xml/navigation_settings.xml

@@ -20,6 +20,9 @@
                     android:title="@string/keep_informing"
                     android:summary="@string/keep_informing_descr" />
             <CheckBoxPreference android:title="@string/show_zoom_buttons_navigation" android:summary="@string/show_zoom_buttons_navigation_descr" android:key="show_zoom_buttons_navigation" />
-            
+            <ListPreference
+                    android:key="arrival_distance_factor"
+                    android:title="@string/arrival_distance"
+                    android:summary="@string/arrival_distance_descr" />
         </PreferenceCategory>
 </PreferenceScreen>

OsmAnd/src/net/osmand/access/SettingsAccessibilityActivity.java

@@ -84,10 +84,6 @@ public class SettingsAccessibilityActivity extends SettingsBaseActivity {
 			cat.addPreference(createCheckBoxPreference(settings.ACCESSIBILITY_EXTENSIONS, R.string.accessibility_extensions,
 					R.string.accessibility_extensions));
 		}
-
-		Float[] arrivalValues = new Float[] {1.5f, 1f, 0.5f, 0.25f} ;
-		String[] arrivalNames = getResources().getStringArray(R.array.arrival_distance_factors);
-		cat.addPreference(createListPreference(settings.ARRIVAL_DISTANCE_FACTOR, arrivalNames, arrivalValues, R.string.arrival_distance, R.string.arrival_distance_descr));
     }
 
 

OsmAnd/src/net/osmand/plus/OsmandSettings.java

@@ -669,7 +669,7 @@ public class OsmandSettings {
 		new FloatPreference("speech_rate", 1f).makeGlobal();
 	
 	public final OsmandPreference<Float> ARRIVAL_DISTANCE_FACTOR =
-		new FloatPreference("arrival_distance_factor", 1f).makeGlobal();
+		new FloatPreference("arrival_distance_factor", 1f).makeProfile();
 
 	// this value string is synchronized with settings_pref.xml preference name
 	public final OsmandPreference<Boolean> USE_TRACKBALL_FOR_MOVEMENTS =

OsmAnd/src/net/osmand/plus/activities/MapActivityActions.java

@@ -255,9 +255,11 @@ public class MapActivityActions implements DialogProvider {
 				View v = convertView;
 				if (v == null) {
 					v = activity.getLayoutInflater().inflate(layout, null);
-					int vl = (int) TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, 16, activity.getResources()
+					int vl = (int) TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, 32, activity.getResources()
 							.getDisplayMetrics());
-					v.findViewById(R.id.icon).setLayoutParams(new LinearLayout.LayoutParams(vl, vl));
+					final LinearLayout.LayoutParams ll = new LinearLayout.LayoutParams(vl, vl);
+					ll.setMargins(vl / 4, vl / 4, vl / 4, vl / 4);
+					v.findViewById(R.id.icon).setLayoutParams(ll);
 				}
 				ImageView icon = (ImageView) v.findViewById(R.id.icon);
 				FavouritePoint fp = points.get(position);

OsmAnd/src/net/osmand/plus/activities/SettingsNavigationActivity.java

@@ -101,6 +101,10 @@ public class SettingsNavigationActivity extends SettingsBaseActivity {
 		speakAlarms = (Preference) screen.findPreference("speak_routing_alarms");
 		speakAlarms.setOnPreferenceClickListener(this);
 		
+		Float[] arrivalValues = new Float[] {1.5f, 1f, 0.5f, 0.25f} ;
+		String[] arrivalNames = getResources().getStringArray(R.array.arrival_distance_factors);
+		registerListPreference(settings.ARRIVAL_DISTANCE_FACTOR, screen, arrivalNames, arrivalValues);
+		
 		profileDialog();
 	}
 	

OsmAnd/src/net/osmand/plus/routepointsnavigation/RoutePointsPlugin.java

@@ -144,7 +144,11 @@ public class RoutePointsPlugin extends OsmandPlugin {
 
 			@Override()
 			public boolean updateInfo(OsmandMapLayer.DrawSettings drawSettings) {
-				setText(getVisitedAllString(), "");
+				if (currentRoute != null) {
+					setText(getVisitedAllString(), "");
+				} else {
+					setText("", app.getString(R.string.route_points_no_gpx));
+				}
 				return true;
 			}