From 5d54cc8b5a8743b60ec37de18d9d4e9c9815787d Mon Sep 17 00:00:00 2001
From: Alexey Kulish <alexey.kulish@osmand.net>
Date: Fri, 4 Dec 2015 10:46:07 +0300
Subject: [PATCH] Fix build

---
 .../audionotes/AudioVideoNotesPlugin.java     | 24 -------------------
 1 file changed, 24 deletions(-)

diff --git a/OsmAnd/src/net/osmand/plus/audionotes/AudioVideoNotesPlugin.java b/OsmAnd/src/net/osmand/plus/audionotes/AudioVideoNotesPlugin.java
index b87e575819..67df45733e 100644
--- a/OsmAnd/src/net/osmand/plus/audionotes/AudioVideoNotesPlugin.java
+++ b/OsmAnd/src/net/osmand/plus/audionotes/AudioVideoNotesPlugin.java
@@ -138,13 +138,9 @@ public class AudioVideoNotesPlugin extends OsmandPlugin {
 	private DataTileManager<Recording> recordings = new DataTileManager<AudioVideoNotesPlugin.Recording>(14);
 	private Map<String, Recording> recordingByFileName = new LinkedHashMap<>();
 	private AudioNotesLayer audioNotesLayer;
-<<<<<<< HEAD
 
 	private MapActivity mapActivity;
 
-=======
-	private MapActivity mapActivity;
->>>>>>> 1b698ba9846114bf9705e622b68a0c00a09c2ea2
 	private static File mediaRecFile;
 	private static MediaRecorder mediaRec;
 	private File lastTakingPhoto;
@@ -769,7 +765,6 @@ public class AudioVideoNotesPlugin extends OsmandPlugin {
 		((AudioManager) activity.getSystemService(Context.AUDIO_SERVICE)).registerMediaButtonEventReceiver(
 				new ComponentName(activity, MediaRemoteControlReceiver.class));
 	}
-<<<<<<< HEAD
 
 	@Override
 	public void mapActivityPause(MapActivity activity) {
@@ -798,15 +793,8 @@ public class AudioVideoNotesPlugin extends OsmandPlugin {
 		recordingMenu = new AudioVideoNoteRecordingMenu(this);
 		recordingDone = false;
 		lockScreenOrientation();
-=======
-	
-	@Override
-	public void mapActivityPause(MapActivity activity) {
-		this.mapActivity = null;
->>>>>>> 1b698ba9846114bf9705e622b68a0c00a09c2ea2
 	}
 
-
 	public void recordVideo(final double lat, final double lon, final MapActivity mapActivity) {
 		if (AV_EXTERNAL_RECORDER.get()) {
 			captureVideoExternal(lat, lon, mapActivity);
@@ -1214,24 +1202,12 @@ public class AudioVideoNotesPlugin extends OsmandPlugin {
 		});
 	}
 
-<<<<<<< HEAD
 	public void stopRecording(final MapActivity mapActivity) {
 		if (!recordingDone) {
 			recordingDone = true;
 			if (!recordControl.isVisible()) {
 				recordControl.setExplicitlyVisible(false);
 				mapActivity.getMapLayers().getMapInfoLayer().recreateControls();
-=======
-	private void updateContextMenu(Recording rec) {
-		if (mapActivity != null) {
-			MapContextMenu menu = mapActivity.getContextMenu();
-			if (menu.isVisible()) {
-				if (rec != null) {
-					menu.show(new LatLon(rec.lat, rec.lon), audioNotesLayer.getObjectName(rec), rec);
-				} else {
-					menu.close();
-				}
->>>>>>> 1b698ba9846114bf9705e622b68a0c00a09c2ea2
 			}
 			stopCameraRecording(mapActivity);
 			SHOW_RECORDINGS.set(true);