From f717f41dc638919fe5506993d4ea357611bf798d Mon Sep 17 00:00:00 2001 From: Alexey Kulish Date: Thu, 15 Sep 2016 11:34:59 +0300 Subject: [PATCH] Fix #3014 --- .../osmand/plus/mapcontextmenu/MapContextMenuFragment.java | 4 ++-- build.gradle | 2 +- gradle/wrapper/gradle-wrapper.properties | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/OsmAnd/src/net/osmand/plus/mapcontextmenu/MapContextMenuFragment.java b/OsmAnd/src/net/osmand/plus/mapcontextmenu/MapContextMenuFragment.java index 7c22f5c199..0f7a9aedd4 100644 --- a/OsmAnd/src/net/osmand/plus/mapcontextmenu/MapContextMenuFragment.java +++ b/OsmAnd/src/net/osmand/plus/mapcontextmenu/MapContextMenuFragment.java @@ -477,7 +477,7 @@ public class MapContextMenuFragment extends Fragment implements DownloadEvents { view.findViewById(R.id.context_menu_bottom_view).setBackgroundColor(nightMode ? getResources().getColor(R.color.ctx_menu_info_view_bg_dark) : getResources().getColor(R.color.ctx_menu_info_view_bg_light)); - getMapActivity().getMapLayers().getMapControlsLayer().setControlsClickable(false); + //getMapActivity().getMapLayers().getMapControlsLayer().setControlsClickable(false); return view; } @@ -782,7 +782,7 @@ public class MapContextMenuFragment extends Fragment implements DownloadEvents { } menu.setMapCenter(null); menu.setMapZoom(0); - getMapActivity().getMapLayers().getMapControlsLayer().setControlsClickable(true); + //getMapActivity().getMapLayers().getMapControlsLayer().setControlsClickable(true); } public void rebuildMenu() { diff --git a/build.gradle b/build.gradle index b438dbfe7e..a9a0ffed03 100644 --- a/build.gradle +++ b/build.gradle @@ -3,7 +3,7 @@ buildscript { mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:2.1.2' + classpath 'com.android.tools.build:gradle:2.1.3' } } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index b5d3423a5e..fc0a0f1d16 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Fri Apr 08 17:52:02 EEST 2016 +#Thu Sep 15 09:42:47 MSK 2016 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-2.10-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-all.zip