From e1d66a7aac2a9d5086689672fcc0d0209527a593 Mon Sep 17 00:00:00 2001 From: Leith Bade Date: Fri, 23 Oct 2015 21:04:24 +1100 Subject: [PATCH] [android] Fix disabling compass Fixes #2752 --- .../src/main/java/com/mapbox/mapboxsdk/views/CompassView.java | 4 ++++ .../java/com/mapbox/mapboxsdk/testapp/BulkMarkerActivity.java | 1 + 2 files changed, 5 insertions(+) diff --git a/android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/views/CompassView.java b/android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/views/CompassView.java index 715b57732..9dc4e4897 100644 --- a/android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/views/CompassView.java +++ b/android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/views/CompassView.java @@ -83,6 +83,10 @@ final class CompassView extends ImageView { mDirection = direction; setRotation((float) direction); + if (!isEnabled()) { + return; + } + if (direction == 0.0) { if (getVisibility() == View.INVISIBLE) { return; diff --git a/android/java/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/BulkMarkerActivity.java b/android/java/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/BulkMarkerActivity.java index e195ea62c..3bddf4e32 100644 --- a/android/java/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/BulkMarkerActivity.java +++ b/android/java/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/BulkMarkerActivity.java @@ -47,6 +47,7 @@ public class BulkMarkerActivity extends AppCompatActivity { mMapView.setAccessToken(ApiAccess.getToken(this)); mMapView.onCreate(savedInstanceState); mMapView.setCenterCoordinate(new LatLngZoom(38.87031, -77.00897, 10)); + mMapView.setCompassEnabled(false); new LoadBulkMarkerTask(mMapView, 27267).execute(); }