summaryrefslogtreecommitdiff
path: root/android
diff options
context:
space:
mode:
authorLeith Bade <leith@mapbox.com>2015-10-23 21:04:24 +1100
committerLeith Bade <leith@mapbox.com>2015-10-23 21:04:24 +1100
commite1d66a7aac2a9d5086689672fcc0d0209527a593 (patch)
tree2e59266d553b751601df9ab69ac2b7bb4cca28cc /android
parent1240f9a0196b0d3a100216374a7d686992539772 (diff)
downloadqtlocation-mapboxgl-e1d66a7aac2a9d5086689672fcc0d0209527a593.tar.gz
[android] Fix disabling compass
Fixes #2752
Diffstat (limited to 'android')
-rw-r--r--android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/views/CompassView.java4
-rw-r--r--android/java/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/BulkMarkerActivity.java1
2 files changed, 5 insertions, 0 deletions
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 715b577328..9dc4e4897c 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 e195ea62c7..3bddf4e32e 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();
}