diff options
author | tobrun <tobrun.van.nuland@gmail.com> | 2018-10-22 14:02:44 +0200 |
---|---|---|
committer | Tobrun <tobrun.van.nuland@gmail.com> | 2018-10-23 12:36:39 +0200 |
commit | 4152497cccd8f76f4a4fe30befdc6ba86186c6be (patch) | |
tree | 1e1f72d2e452a420f9d6c8bf087a110aaf50039e /platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/BackgroundLayer.java | |
parent | 79fda661690cfd80371a22dc6327c027badb9303 (diff) | |
download | qtlocation-mapboxgl-upstream/tvn-revert-nullify.tar.gz |
Revert "[android] - infer nullity"upstream/tvn-revert-nullify
This reverts commit 617742710852a5a958a13f2b659f8c307973e49d.
Diffstat (limited to 'platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/BackgroundLayer.java')
-rw-r--r-- | platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/BackgroundLayer.java | 19 |
1 files changed, 3 insertions, 16 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 a89f012fe6..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 @@ -51,7 +51,6 @@ public class BackgroundLayer extends Layer { * @param properties the var-args properties * @return This */ - @NonNull public BackgroundLayer withProperties(@NonNull PropertyValue<?>... properties) { setProperties(properties); return this; @@ -64,7 +63,6 @@ public class BackgroundLayer extends Layer { * * @return property wrapper value around String */ - @NonNull @SuppressWarnings("unchecked") public PropertyValue<String> getBackgroundColor() { checkThread(); @@ -93,7 +91,6 @@ public class BackgroundLayer extends Layer { * * @return transition options for String */ - @NonNull public TransitionOptions getBackgroundColorTransition() { checkThread(); return nativeGetBackgroundColorTransition(); @@ -104,7 +101,7 @@ public class BackgroundLayer extends Layer { * * @param options transition options for String */ - public void setBackgroundColorTransition(@NonNull TransitionOptions options) { + public void setBackgroundColorTransition(TransitionOptions options) { checkThread(); nativeSetBackgroundColorTransition(options.getDuration(), options.getDelay()); } @@ -114,7 +111,6 @@ public class BackgroundLayer extends Layer { * * @return property wrapper value around String */ - @NonNull @SuppressWarnings("unchecked") public PropertyValue<String> getBackgroundPattern() { checkThread(); @@ -126,7 +122,6 @@ public class BackgroundLayer extends Layer { * * @return transition options for String */ - @NonNull public TransitionOptions getBackgroundPatternTransition() { checkThread(); return nativeGetBackgroundPatternTransition(); @@ -137,7 +132,7 @@ public class BackgroundLayer extends Layer { * * @param options transition options for String */ - public void setBackgroundPatternTransition(@NonNull TransitionOptions options) { + public void setBackgroundPatternTransition(TransitionOptions options) { checkThread(); nativeSetBackgroundPatternTransition(options.getDuration(), options.getDelay()); } @@ -147,7 +142,6 @@ public class BackgroundLayer extends Layer { * * @return property wrapper value around Float */ - @NonNull @SuppressWarnings("unchecked") public PropertyValue<Float> getBackgroundOpacity() { checkThread(); @@ -159,7 +153,6 @@ public class BackgroundLayer extends Layer { * * @return transition options for Float */ - @NonNull public TransitionOptions getBackgroundOpacityTransition() { checkThread(); return nativeGetBackgroundOpacityTransition(); @@ -170,38 +163,32 @@ public class BackgroundLayer extends Layer { * * @param options transition options for Float */ - public void setBackgroundOpacityTransition(@NonNull TransitionOptions options) { + public void setBackgroundOpacityTransition(TransitionOptions options) { checkThread(); nativeSetBackgroundOpacityTransition(options.getDuration(), options.getDelay()); } - @NonNull @Keep private native Object nativeGetBackgroundColor(); - @NonNull @Keep private native TransitionOptions nativeGetBackgroundColorTransition(); @Keep private native void nativeSetBackgroundColorTransition(long duration, long delay); - @NonNull @Keep private native Object nativeGetBackgroundPattern(); - @NonNull @Keep private native TransitionOptions nativeGetBackgroundPatternTransition(); @Keep private native void nativeSetBackgroundPatternTransition(long duration, long delay); - @NonNull @Keep private native Object nativeGetBackgroundOpacity(); - @NonNull @Keep private native TransitionOptions nativeGetBackgroundOpacityTransition(); |