diff options
| author | Tobrun <tobrun.van.nuland@gmail.com> | 2016-10-25 15:53:16 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-10-25 15:53:16 +0200 |
| commit | b0485bccd9ddc5d6a3589c433cd1f3a103f857ea (patch) | |
| tree | 87011b5b07e10697301ea9a7d135056f8bd1325b /platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapView.java | |
| parent | 94b1a53f06750926a88b62f8e1cedd42d1df91da (diff) | |
| download | qtlocation-mapboxgl-b0485bccd9ddc5d6a3589c433cd1f3a103f857ea.tar.gz | |
[android] - remove timer from compassView, make fading when facing north optional. (#6786)
save state for recreating map view
fix review comments
unit test covering default value for fading and setting a new value
fixup setter, fix default value
Diffstat (limited to 'platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapView.java')
| -rw-r--r-- | platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapView.java | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapView.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapView.java index 920cafcb8c..32b327e8d0 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapView.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapView.java @@ -329,6 +329,7 @@ public class MapView extends FrameLayout { int tenDp = (int) getResources().getDimension(R.dimen.ten_dp); uiSettings.setCompassMargins(tenDp, tenDp, tenDp, tenDp); } + uiSettings.setCompassFadeFacingNorth(options.getCompassFadeFacingNorth()); // Logo uiSettings.setLogoEnabled(options.getLogoEnabled()); @@ -414,6 +415,7 @@ public class MapView extends FrameLayout { savedInstanceState.getInt(MapboxConstants.STATE_COMPASS_MARGIN_TOP), savedInstanceState.getInt(MapboxConstants.STATE_COMPASS_MARGIN_RIGHT), savedInstanceState.getInt(MapboxConstants.STATE_COMPASS_MARGIN_BOTTOM)); + uiSettings.setCompassFadeFacingNorth(savedInstanceState.getBoolean(MapboxConstants.STATE_COMPASS_FADE_WHEN_FACING_NORTH)); // Logo uiSettings.setLogoEnabled(savedInstanceState.getBoolean(MapboxConstants.STATE_LOGO_ENABLED)); @@ -551,6 +553,7 @@ public class MapView extends FrameLayout { outState.putInt(MapboxConstants.STATE_COMPASS_MARGIN_TOP, uiSettings.getCompassMarginTop()); outState.putInt(MapboxConstants.STATE_COMPASS_MARGIN_BOTTOM, uiSettings.getCompassMarginBottom()); outState.putInt(MapboxConstants.STATE_COMPASS_MARGIN_RIGHT, uiSettings.getCompassMarginRight()); + outState.putBoolean(MapboxConstants.STATE_COMPASS_FADE_WHEN_FACING_NORTH, uiSettings.isCompassFadeWhenFacingNorth()); // UiSettings - Logo outState.putInt(MapboxConstants.STATE_LOGO_GRAVITY, uiSettings.getLogoGravity()); @@ -2736,6 +2739,10 @@ public class MapView extends FrameLayout { setWidgetMargins(compassView, left, top, right, bottom); } + void setCompassFadeFacingNorth(boolean compassFadeFacingNorth) { + compassView.fadeCompassViewFacingNorth(compassFadeFacingNorth); + } + // // Logo // |