tei/MapLibreParticleLab
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'release-agua' into master

Browse Source 
# Conflicts:
#	platform/android/CHANGELOG.md
#	platform/android/MapboxGLAndroidSDK/gradle.properties
#	platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapView.java
#	platform/ios/CHANGELOG.md
#	platform/ios/ios.xcodeproj/project.pbxproj
#	platform/macos/CHANGELOG.md
This commit is contained in:
Fabian Guerra
2018-01-17 09:41:37 -05:00
parent 69ac7b6922 2411fb31b7
commit 42bcb4b405
14 changed files with 279 additions and 108 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/PropertyFactory.java
View File

@@ -3364,7 +3364,6 @@ public class PropertyFactory {
return new LayoutPropertyValue<>("text-optional", value);
}
/**
* If true, icons will display without their corresponding text when the text collides with other symbols and the icon does not.
*