summaryrefslogtreecommitdiff
path: root/platform/android/MapboxGLAndroidSDK/src/main
diff options
context:
space:
mode:
authorKonstantin Käfer <mail@kkaefer.com>2018-01-10 16:04:06 -0800
committerKonstantin Käfer <mail@kkaefer.com>2018-01-24 08:35:31 -0800
commit9d1fa508a34f013573294794028f4ffa5a5f5f3d (patch)
treeeb6ac03a51c5206040a2b46919c2c1433a292775 /platform/android/MapboxGLAndroidSDK/src/main
parent1a2c316f951ad4d19b0eb89eba2559801deaa385 (diff)
downloadqtlocation-mapboxgl-9d1fa508a34f013573294794028f4ffa5a5f5f3d.tar.gz
[build] Add temporary modifications to style spec + shaders
This ensures that the generated code matches what is checked in. Remove those temporary modifications once we add the features to master.
Diffstat (limited to 'platform/android/MapboxGLAndroidSDK/src/main')
-rw-r--r--platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/PropertyFactory.java1
1 files changed, 1 insertions, 0 deletions
diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/PropertyFactory.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/PropertyFactory.java
index 1b9106afaf..6e644c5591 100644
--- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/PropertyFactory.java
+++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/PropertyFactory.java
@@ -3592,6 +3592,7 @@ 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.
*