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

OsmAnd/res/values-da/strings.xml

@@ -2204,4 +2204,5 @@
     <string name="update_time">Opdateringstid</string>
 <string name="size_pattern">Størrelse: %s</string>
 <string name="updates_size_pattern">Opdateringer: %s</string>
+<string name="last_map_change">Sidste ændring af kort: %s</string>
 </resources>

OsmAnd/res/values-de/strings.xml

@@ -2090,4 +2090,5 @@
 <string name="update_date_pattern">Aktualisierung: %s</string>
     <string name="update_time">Aktualisierungszeitpunkt</string>
 <string name="updates_size_pattern">Aktualisierungen: %s</string>
+<string name="last_map_change">Letzte Kartenänderung: %s</string>
 </resources>

OsmAnd/res/values-fr/strings.xml

@@ -2090,4 +2090,5 @@
 <string name="update_date_pattern">Mise à jour : %s</string>
     <string name="update_time">Heure de mise à jour</string>
 <string name="updates_size_pattern">Mises à jour : %s</string>
+<string name="last_map_change">Dernier carte modifiée : %s</string>
 </resources>

OsmAnd/res/values-zh-rTW/strings.xml

@@ -2050,4 +2050,5 @@
     <string name="update_time">更新時間</string>
 <string name="size_pattern">大小：%s</string>
 <string name="updates_size_pattern">更新：%s</string>
+<string name="last_map_change">上次地圖的更改：%s</string>
 </resources>

OsmAnd/src/net/osmand/plus/audionotes/AudioVideoNotesPlugin.java

@@ -142,6 +142,12 @@ public class AudioVideoNotesPlugin extends OsmandPlugin {
 	public final CommonPreference<Integer> AV_DEFAULT_ACTION;
 	public final OsmandPreference<Boolean> SHOW_RECORDINGS;
 
+	public static final int CLIP_LENGTH_DEFAULT = 5;
+	public static final int STORAGE_SIZE_DEFAULT = 5;
+	public final CommonPreference<Boolean> AV_RECORDER_SPLIT;
+	public final CommonPreference<Integer> AV_RS_CLIP_LENGTH;
+	public final CommonPreference<Integer> AV_RS_STORAGE_SIZE;
+
 	private DataTileManager<Recording> recordings = new DataTileManager<AudioVideoNotesPlugin.Recording>(14);
 	private Map<String, Recording> recordingByFileName = new LinkedHashMap<>();
 	private AudioNotesLayer audioNotesLayer;
@@ -498,6 +504,10 @@ public class AudioVideoNotesPlugin extends OsmandPlugin {
 		AV_PHOTO_PLAY_SOUND = settings.registerBooleanPreference("av_photo_play_sound", true).makeGlobal();
 
 		SHOW_RECORDINGS = settings.registerBooleanPreference("show_recordings", true).makeGlobal();
+
+		AV_RECORDER_SPLIT = settings.registerBooleanPreference("av_recorder_split", false).makeGlobal();
+		AV_RS_CLIP_LENGTH = settings.registerIntPreference("av_rs_clip_length", CLIP_LENGTH_DEFAULT).makeGlobal();
+		AV_RS_STORAGE_SIZE = settings.registerIntPreference("av_rs_storage_size", STORAGE_SIZE_DEFAULT).makeGlobal();
 	}
 
 	@Override
@@ -887,7 +897,7 @@ public class AudioVideoNotesPlugin extends OsmandPlugin {
 					}
 
 					int cameraOrientation = getCamOrientation(mapActivity, Camera.CameraInfo.CAMERA_FACING_BACK);
-					//cam.setDisplayOrientation(cameraOrientation);
+					cam.setDisplayOrientation(cameraOrientation);
 					parameters.set("rotation", cameraOrientation);
 					if (mPreviewSize != null) {
 						parameters.setPreviewSize(mPreviewSize.width, mPreviewSize.height);
@@ -1143,11 +1153,11 @@ public class AudioVideoNotesPlugin extends OsmandPlugin {
 						parameters.setPictureSize(selectedCamPicSize.width, selectedCamPicSize.height);
 						log.debug("takePhotoWithCamera() set Picture size: width=" + selectedCamPicSize.width
 								+ " height=" + selectedCamPicSize.height);
-/*
+
 						// camera focus type
 						autofocus = true;
-						parameters.setGpsLatitude(lat);
+						//parameters.setGpsLatitude(lat);
-						parameters.setGpsLongitude(lon);
+						//parameters.setGpsLongitude(lon);
 						switch (AV_CAMERA_FOCUS_TYPE.get()) {
 							case AV_CAMERA_FOCUS_HIPERFOCAL:
 								parameters.setFocusMode(Parameters.FOCUS_MODE_FIXED);
@@ -1186,10 +1196,9 @@ public class AudioVideoNotesPlugin extends OsmandPlugin {
 								&& parameters.getSupportedFlashModes().contains(Parameters.FLASH_MODE_AUTO)) {
 							parameters.setFlashMode(Parameters.FLASH_MODE_AUTO);
 						}
-*/
+
-						autofocus = false;
 						int cameraOrientation = getCamOrientation(mapActivity, Camera.CameraInfo.CAMERA_FACING_BACK);
-						//cam.setDisplayOrientation(cameraOrientation);
+						cam.setDisplayOrientation(cameraOrientation);
 						parameters.set("rotation", cameraOrientation);
 						if (mPreviewSize != null) {
 							parameters.setPreviewSize(mPreviewSize.width, mPreviewSize.height);