[android] - use appcompat resource configuration for vector drawables

mapbox · Oct 16, 2018 · 62af756 · 62af756
1 parent 26896f2
commit 62af756
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 7 deletions.
diff --git a/...droid/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/widgets/CompassView.java b/...droid/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/widgets/CompassView.java
@@ -1,17 +1,16 @@
 package com.mapbox.mapboxsdk.maps.widgets;
 
-import android.annotation.SuppressLint;
 import android.content.Context;
 import android.graphics.drawable.Drawable;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 import android.support.v4.view.ViewCompat;
 import android.support.v4.view.ViewPropertyAnimatorCompat;
 import android.support.v4.view.ViewPropertyAnimatorListenerAdapter;
+import android.support.v7.widget.AppCompatImageView;
 import android.util.AttributeSet;
 import android.view.View;
 import android.view.ViewGroup;
-import android.widget.ImageView;
 
 import com.mapbox.mapboxsdk.maps.MapboxMap;
 
@@ -24,8 +23,7 @@
  * use {@link com.mapbox.mapboxsdk.maps.UiSettings}.
  * </p>
  */
-@SuppressLint("AppCompatCustomView")
-public final class CompassView extends ImageView implements Runnable {
+public final class CompassView extends AppCompatImageView implements Runnable {
 
   public static final long TIME_WAIT_IDLE = 500;
   public static final long TIME_MAP_NORTH_ANIMATION = 150;

diff --git a/platform/android/MapboxGLAndroidSDK/src/main/res/layout/mapbox_mapview_internal.xml b/platform/android/MapboxGLAndroidSDK/src/main/res/layout/mapbox_mapview_internal.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<merge xmlns:android="http://schemas.android.com/apk/res/android">
+<merge xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
 
     <FrameLayout
         android:id="@+id/markerViewContainer"
@@ -20,7 +20,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:contentDescription="@null"
-        android:src="@drawable/mapbox_logo_icon"/>
+        app:srcCompat="@drawable/mapbox_logo_icon"/>
 
     <ImageView
         android:visibility="gone"
@@ -31,6 +31,6 @@
         android:clickable="true"
         android:focusable="true"
         android:contentDescription="@string/mapbox_attributionsIconContentDescription"
-        android:src="@drawable/mapbox_info_bg_selector"/>
+        app:srcCompat="@drawable/mapbox_info_bg_selector"/>
 
 </merge>