summaryrefslogtreecommitdiff
path: root/platform/android
diff options
context:
space:
mode:
authorCameron Mace <cameron@mapbox.com>2016-11-07 18:23:18 -0500
committerGitHub <noreply@github.com>2016-11-07 18:23:18 -0500
commit6b85d4c2f96f5213aab882640901660e45fc97ca (patch)
tree26a0d46c34d614b31c5d57bb103ceb3d3a4dbea7 /platform/android
parent2e76fca473409d370da7dc2ec6d8cfc82183137e (diff)
downloadqtlocation-mapboxgl-6b85d4c2f96f5213aab882640901660e45fc97ca.tar.gz
added attribution tint color check (#6950)
Diffstat (limited to 'platform/android')
-rw-r--r--platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapView.java8
1 files changed, 7 insertions, 1 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 d1e2b1a253..fc916024b1 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
@@ -15,6 +15,7 @@ import android.content.res.Resources;
import android.graphics.Bitmap;
import android.graphics.BitmapFactory;
import android.graphics.Canvas;
+import android.graphics.Color;
import android.graphics.PointF;
import android.graphics.RectF;
import android.graphics.SurfaceTexture;
@@ -2458,7 +2459,12 @@ public class MapView extends FrameLayout {
}
void setAtttibutionTintColor(int tintColor) {
- ColorUtils.setTintList(attributionsView, tintColor);
+ // Check that the tint color being passed in isn't transparent.
+ if (Color.alpha(tintColor) == 0) {
+ ColorUtils.setTintList(attributionsView, ContextCompat.getColor(getContext(), R.color.mapbox_blue));
+ } else {
+ ColorUtils.setTintList(attributionsView, tintColor);
+ }
}
int getAttributionTintColor() {