Skip to content
This repository has been archived by the owner on Aug 8, 2023. It is now read-only.

Use appcompat configuration to support vector drawables #13114

Merged
merged 1 commit into from
Oct 16, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -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;

Expand All @@ -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;
Expand Down
Original file line number Diff line number Diff line change
@@ -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"
Expand All @@ -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"
Expand All @@ -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>