1 files changed, 62 insertions, 0 deletions
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 b3eb5a39c1..7938af3c80 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
@@ -17,15 +17,77 @@ public class FillLayer extends Layer {
     protected native void initialize(String layerId, String sourceId);
 
     public void setSourceLayer(String sourceLayer) {
+        checkValidity();
         nativeSetSourceLayer(sourceLayer);
     }
 
     public void setFilter(Filter.Statement filter) {
+        checkValidity();
         this.setFilter(filter.toArray());
     }
 
     public void setFilter(Object[] filter) {
+        checkValidity();
         nativeSetFilter(filter);
     }
 
+
+    // Property getters
+
+    @SuppressWarnings("unchecked")
+    public PropertyValue<Boolean> getFillAntialias() {
+        checkValidity();
+        return (PropertyValue<Boolean>) new PropertyValue(nativeGetFillAntialias());
+    }
+
+    @SuppressWarnings("unchecked")
+    public PropertyValue<Float> getFillOpacity() {
+        checkValidity();
+        return (PropertyValue<Float>) new PropertyValue(nativeGetFillOpacity());
+    }
+
+    @SuppressWarnings("unchecked")
+    public PropertyValue<String> getFillColor() {
+        checkValidity();
+        return (PropertyValue<String>) new PropertyValue(nativeGetFillColor());
+    }
+
+    @SuppressWarnings("unchecked")
+    public PropertyValue<String> getFillOutlineColor() {
+        checkValidity();
+        return (PropertyValue<String>) new PropertyValue(nativeGetFillOutlineColor());
+    }
+
+    @SuppressWarnings("unchecked")
+    public PropertyValue<Float[]> getFillTranslate() {
+        checkValidity();
+        return (PropertyValue<Float[]>) new PropertyValue(nativeGetFillTranslate());
+    }
+
+    @SuppressWarnings("unchecked")
+    public PropertyValue<String> getFillTranslateAnchor() {
+        checkValidity();
+        return (PropertyValue<String>) new PropertyValue(nativeGetFillTranslateAnchor());
+    }
+
+    @SuppressWarnings("unchecked")
+    public PropertyValue<String> getFillPattern() {
+        checkValidity();
+        return (PropertyValue<String>) new PropertyValue(nativeGetFillPattern());
+    }
+
+    private native Object nativeGetFillAntialias();
+
+    private native Object nativeGetFillOpacity();
+
+    private native Object nativeGetFillColor();
+
+    private native Object nativeGetFillOutlineColor();
+
+    private native Object nativeGetFillTranslate();
+
+    private native Object nativeGetFillTranslateAnchor();
+
+    private native Object nativeGetFillPattern();
+
 }