diff options
author | Tobrun <tobrun.van.nuland@gmail.com> | 2018-10-16 18:30:58 +0200 |
---|---|---|
committer | Tobrun <tobrun@mapbox.com> | 2018-10-17 15:55:26 +0200 |
commit | f9d6420e03ead4c9244f2d0b818154b56f2d4415 (patch) | |
tree | e42ca28a92cc3660037b0c3660123a6d76bb6d25 /platform/android/MapboxGLAndroidSDK/src/main | |
parent | 1cd387129ee5a7f38ce26cf0bd18b79949dac6c7 (diff) | |
download | qtlocation-mapboxgl-f9d6420e03ead4c9244f2d0b818154b56f2d4415.tar.gz |
[android] - use appcompat resource configuration for vector drawables
Diffstat (limited to 'platform/android/MapboxGLAndroidSDK/src/main')
2 files changed, 5 insertions, 7 deletions
diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/widgets/CompassView.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/widgets/CompassView.java index fb2c70cb73..45f72af1c5 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/widgets/CompassView.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/widgets/CompassView.java @@ -1,16 +1,15 @@ 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.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; @@ -23,8 +22,7 @@ import com.mapbox.mapboxsdk.maps.MapboxMap; * 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 index 8dd4a858df..e7644373fd 100644 --- 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> |