Android-builders-club/OsmAnd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse source
This commit is contained in:
Weblate 2016-09-15 10:35:35 +02:00
commit b0b6429523
3 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
OsmAnd/src/net/osmand/plus/mapcontextmenu/MapContextMenuFragment.java
View file

@ -477,7 +477,7 @@ public class MapContextMenuFragment extends Fragment implements DownloadEvents {
view.findViewById(R.id.context_menu_bottom_view).setBackgroundColor(nightMode ? 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)); 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; return view;
} }
@ -782,7 +782,7 @@ public class MapContextMenuFragment extends Fragment implements DownloadEvents {
} }
menu.setMapCenter(null); menu.setMapCenter(null);
menu.setMapZoom(0); menu.setMapZoom(0);
getMapActivity().getMapLayers().getMapControlsLayer().setControlsClickable(true); //getMapActivity().getMapLayers().getMapControlsLayer().setControlsClickable(true);
} }
public void rebuildMenu() { public void rebuildMenu() {

2
build.gradle
View file

@ -3,7 +3,7 @@ buildscript {
mavenCentral() mavenCentral()
} }
dependencies { dependencies {
classpath 'com.android.tools.build:gradle:2.1.2' classpath 'com.android.tools.build:gradle:2.1.3'
} }
} }

4
gradle/wrapper/gradle-wrapper.properties vendored
View file

@ -1,6 +1,6 @@
#Fri Apr 08 17:52:02 EEST 2016 #Thu Sep 15 09:42:47 MSK 2016
distributionBase=GRADLE_USER_HOME distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists 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