From fce2fb9e001f48d8ade80e692f9d43343f61b7fb Mon Sep 17 00:00:00 2001
From: Alexey Kulish <alexey.kulish@osmand.net>
Date: Wed, 6 Jul 2016 17:47:42 +0300
Subject: [PATCH] Fix #2562

---
 OsmAnd/res/layout-land/map_hud_bottom.xml                     | 4 +---
 .../osmand/plus/audionotes/AudioVideoNoteRecordingMenu.java   | 2 +-
 .../src/net/osmand/plus/audionotes/AudioVideoNotesPlugin.java | 2 +-
 3 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/OsmAnd/res/layout-land/map_hud_bottom.xml b/OsmAnd/res/layout-land/map_hud_bottom.xml
index 9f35f9ffef..f2b6657a58 100644
--- a/OsmAnd/res/layout-land/map_hud_bottom.xml
+++ b/OsmAnd/res/layout-land/map_hud_bottom.xml
@@ -66,9 +66,7 @@
                     layout="@layout/recording_note_fragment"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_gravity="bottom|left"
-                    android:visibility="gone"
-                    tools:visibility="visible"/>
+                    android:layout_gravity="bottom|left"/>
 
                 <LinearLayout
                     android:layout_width="wrap_content"
diff --git a/OsmAnd/src/net/osmand/plus/audionotes/AudioVideoNoteRecordingMenu.java b/OsmAnd/src/net/osmand/plus/audionotes/AudioVideoNoteRecordingMenu.java
index 6fa8af8e48..c0c909cdf9 100644
--- a/OsmAnd/src/net/osmand/plus/audionotes/AudioVideoNoteRecordingMenu.java
+++ b/OsmAnd/src/net/osmand/plus/audionotes/AudioVideoNoteRecordingMenu.java
@@ -205,7 +205,7 @@ public class AudioVideoNoteRecordingMenu {
 		CurrentRecording recording = plugin.getCurrentRecording();
 		boolean show = showViewfinder && recording != null && recording.getType() != AVActionType.REC_AUDIO;
 		if (isLandscapeLayout() && mapActivity != null) {
-			int buttonsHeight = view.findViewById(R.id.buttonsContainer).getHeight();
+			int buttonsHeight = (int) view.getResources().getDimension(R.dimen.map_route_buttons_height);
 			int tileBoxHeight = mapActivity.getMapView().getCurrentRotatedTileBox().getPixHeight();
 			int h = show ? tileBoxHeight : buttonsHeight;
 			view.setLayoutParams(new LinearLayout.LayoutParams(AndroidUtils.dpToPx(mapActivity, 320f), h));
diff --git a/OsmAnd/src/net/osmand/plus/audionotes/AudioVideoNotesPlugin.java b/OsmAnd/src/net/osmand/plus/audionotes/AudioVideoNotesPlugin.java
index 4e857b0b43..21b11fa660 100644
--- a/OsmAnd/src/net/osmand/plus/audionotes/AudioVideoNotesPlugin.java
+++ b/OsmAnd/src/net/osmand/plus/audionotes/AudioVideoNotesPlugin.java
@@ -1503,7 +1503,7 @@ public class AudioVideoNotesPlugin extends OsmandPlugin {
 
 	private void updateRecordControl(final MapActivity mapActivity, final File f) {
 		recordControl.setText(app.getString(R.string.shared_string_control_stop), "");
-		recordControl.setImageDrawable(mapActivity.getResources().getDrawable(R.drawable.widget_icon_av_active));
+		recordControl.setIcons(R.drawable.widget_icon_av_active, R.drawable.widget_icon_av_active);
 		final MapInfoLayer mil = mapActivity.getMapLayers().getMapInfoLayer();
 		if (!recordControl.isVisible()) {
 			recordControl.setExplicitlyVisible(true);