Merge branch 'master' of github.com:mapbox/mapbox-gl-native into bwg-vs2017

13 files changed, 14 insertions, 14 deletions

diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/BackgroundLayer.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/BackgroundLayer.java
index ddb4d04fff..dd20a4b957 100644
--- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/BackgroundLayer.java
+++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/BackgroundLayer.java
@@ -28,7 +28,7 @@ public class BackgroundLayer extends Layer {
    * @param nativePtr pointer used by core
    */
   @Keep
-  public BackgroundLayer(long nativePtr) {
+  BackgroundLayer(long nativePtr) {
     super(nativePtr);
   }
 
diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/CircleLayer.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/CircleLayer.java
index 8abd78ace2..9d2b9d89a5 100644
--- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/CircleLayer.java
+++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/CircleLayer.java
@@ -28,7 +28,7 @@ public class CircleLayer extends Layer {
    * @param nativePtr pointer used by core
    */
   @Keep
-  public CircleLayer(long nativePtr) {
+  CircleLayer(long nativePtr) {
     super(nativePtr);
   }
 
diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/CustomLayer.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/CustomLayer.java
index 79b68bbfc0..c03f8689fc 100644
--- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/CustomLayer.java
+++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/CustomLayer.java
@@ -16,7 +16,7 @@ public class CustomLayer extends Layer {
   }
 
   @Keep
-  public CustomLayer(long nativePtr) {
+  CustomLayer(long nativePtr) {
     super(nativePtr);
   }
 
diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/FillExtrusionLayer.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/FillExtrusionLayer.java
index 6efe04e39d..2de0de06d9 100644
--- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/FillExtrusionLayer.java
+++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/FillExtrusionLayer.java
@@ -28,7 +28,7 @@ public class FillExtrusionLayer extends Layer {
    * @param nativePtr pointer used by core
    */
   @Keep
-  public FillExtrusionLayer(long nativePtr) {
+  FillExtrusionLayer(long nativePtr) {
     super(nativePtr);
   }
 
diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/FillLayer.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/FillLayer.java
index aaa20d6f3a..6e28900c26 100644
--- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/FillLayer.java
+++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/FillLayer.java
@@ -28,7 +28,7 @@ public class FillLayer extends Layer {
    * @param nativePtr pointer used by core
    */
   @Keep
-  public FillLayer(long nativePtr) {
+  FillLayer(long nativePtr) {
     super(nativePtr);
   }
 
diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/HeatmapLayer.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/HeatmapLayer.java
index 6d7cece124..f1076ecd96 100644
--- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/HeatmapLayer.java
+++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/HeatmapLayer.java
@@ -28,7 +28,7 @@ public class HeatmapLayer extends Layer {
    * @param nativePtr pointer used by core
    */
   @Keep
-  public HeatmapLayer(long nativePtr) {
+  HeatmapLayer(long nativePtr) {
     super(nativePtr);
   }
 
diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/HillshadeLayer.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/HillshadeLayer.java
index f906104e91..f706e5a234 100644
--- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/HillshadeLayer.java
+++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/HillshadeLayer.java
@@ -28,7 +28,7 @@ public class HillshadeLayer extends Layer {
    * @param nativePtr pointer used by core
    */
   @Keep
-  public HillshadeLayer(long nativePtr) {
+  HillshadeLayer(long nativePtr) {
     super(nativePtr);
   }
 
diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/Layer.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/Layer.java
index 92aa54e55f..605f883bdb 100644
--- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/Layer.java
+++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/Layer.java
@@ -18,7 +18,7 @@ public abstract class Layer {
   private boolean invalidated;
 
   @Keep
-  public Layer(long nativePtr) {
+  protected Layer(long nativePtr) {
     checkThread();
     this.nativePtr = nativePtr;
   }
diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/LineLayer.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/LineLayer.java
index 4a742cd7a6..d6519c991f 100644
--- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/LineLayer.java
+++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/LineLayer.java
@@ -28,7 +28,7 @@ public class LineLayer extends Layer {
    * @param nativePtr pointer used by core
    */
   @Keep
-  public LineLayer(long nativePtr) {
+  LineLayer(long nativePtr) {
     super(nativePtr);
   }
 
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 1cedf8c9ca..cd7bd473f3 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
@@ -2055,7 +2055,7 @@ public class PropertyFactory {
   }
 
   /**
-   * Value to use for a text label.
+   * Value to use for a text label. If a plain `string` is provided, it will be treated as a `formatted` with default/inherited formatting options.
    *
    * @param value a String value
    * @return property wrapper around String
@@ -2065,7 +2065,7 @@ public class PropertyFactory {
   }
 
   /**
-   * Value to use for a text label.
+   * Value to use for a text label. If a plain `string` is provided, it will be treated as a `formatted` with default/inherited formatting options.
    *
    * @param value a String value
    * @return property wrapper around String
diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/RasterLayer.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/RasterLayer.java
index 83e228cba0..50837a97be 100644
--- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/RasterLayer.java
+++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/RasterLayer.java
@@ -28,7 +28,7 @@ public class RasterLayer extends Layer {
    * @param nativePtr pointer used by core
    */
   @Keep
-  public RasterLayer(long nativePtr) {
+  RasterLayer(long nativePtr) {
     super(nativePtr);
   }
 
diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/SymbolLayer.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/SymbolLayer.java
index f2ddb600a5..4389f6cb21 100644
--- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/SymbolLayer.java
+++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/SymbolLayer.java
@@ -28,7 +28,7 @@ public class SymbolLayer extends Layer {
    * @param nativePtr pointer used by core
    */
   @Keep
-  public SymbolLayer(long nativePtr) {
+  SymbolLayer(long nativePtr) {
     super(nativePtr);
   }
 
diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/layer.java.ejs b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/layer.java.ejs
index 2d4db2b55d..6ed58b1928 100644
--- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/layer.java.ejs
+++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/layer.java.ejs
@@ -33,7 +33,7 @@ public class <%- camelize(type) %>Layer extends Layer {
    * @param nativePtr pointer used by core
    */
   @Keep
-  public <%- camelize(type) %>Layer(long nativePtr) {
+  <%- camelize(type) %>Layer(long nativePtr) {
     super(nativePtr);
   }