Merge remote-tracking branch 'origin/master'

2017-12-11 23:36:46 +01:00 · 2017-12-11 23:36:46 +01:00 · 57b8023d3c
commit 57b8023d3c
parent b665ed1fac 08a015eeb9
13 changed files with 2 additions and 2 deletions
--- a/OsmAnd/res/drawable-hdpi/ic_action_group_name_16.png
+++ b/OsmAnd/res/drawable-hdpi/ic_action_group_name_16.png
--- a/OsmAnd/res/drawable-hdpi/ic_action_opening_hour_16.png
+++ b/OsmAnd/res/drawable-hdpi/ic_action_opening_hour_16.png
--- a/OsmAnd/res/drawable-hdpi/ic_action_track_file_16.png
+++ b/OsmAnd/res/drawable-hdpi/ic_action_track_file_16.png
--- a/OsmAnd/res/drawable-mdpi/ic_action_group_name_16.png
+++ b/OsmAnd/res/drawable-mdpi/ic_action_group_name_16.png
--- a/OsmAnd/res/drawable-mdpi/ic_action_opening_hour_16.png
+++ b/OsmAnd/res/drawable-mdpi/ic_action_opening_hour_16.png
--- a/OsmAnd/res/drawable-mdpi/ic_action_track_file_16.png
+++ b/OsmAnd/res/drawable-mdpi/ic_action_track_file_16.png
--- a/OsmAnd/res/drawable-xhdpi/ic_action_group_name_16.png
+++ b/OsmAnd/res/drawable-xhdpi/ic_action_group_name_16.png
--- a/OsmAnd/res/drawable-xhdpi/ic_action_opening_hour_16.png
+++ b/OsmAnd/res/drawable-xhdpi/ic_action_opening_hour_16.png
--- a/OsmAnd/res/drawable-xhdpi/ic_action_track_file_16.png
+++ b/OsmAnd/res/drawable-xhdpi/ic_action_track_file_16.png
--- a/OsmAnd/res/drawable-xxhdpi/ic_action_group_name_16.png
+++ b/OsmAnd/res/drawable-xxhdpi/ic_action_group_name_16.png
--- a/OsmAnd/res/drawable-xxhdpi/ic_action_opening_hour_16.png
+++ b/OsmAnd/res/drawable-xxhdpi/ic_action_opening_hour_16.png
--- a/OsmAnd/res/drawable-xxhdpi/ic_action_track_file_16.png
+++ b/OsmAnd/res/drawable-xxhdpi/ic_action_track_file_16.png
--- a/OsmAnd/src/net/osmand/plus/mapcontextmenu/MapContextMenu.java
+++ b/OsmAnd/src/net/osmand/plus/mapcontextmenu/MapContextMenu.java
@ -440,7 +440,7 @@ public class MapContextMenu extends MenuTitleController implements StateChangedL
 		return result;
 	}

-	public boolean hide(boolean allowTransitionAnimation) {
+	public boolean hide(boolean animated) {
 		boolean result = false;
 		if (mapPosition != 0) {
 			mapActivity.getMapView().setMapPosition(mapPosition);
@ -451,7 +451,7 @@ public class MapContextMenu extends MenuTitleController implements StateChangedL
 		}
 		WeakReference<MapContextMenuFragment> fragmentRef = findMenuFragment();
 		if (fragmentRef != null) {
-			if (!allowTransitionAnimation) {
+			if (!animated) {
 				fragmentRef.get().disableTransitionAnimation();
 			}
 			fragmentRef.get().dismissMenu();