diff options
author | kevin <kevin.li@mapbox.com> | 2018-12-03 14:19:31 +0800 |
---|---|---|
committer | kevin <kevin.li@mapbox.com> | 2018-12-03 14:19:31 +0800 |
commit | 788158cc5608bc428b13ad0ef6215626e1acaffd (patch) | |
tree | 34a80d39365da9f2c24785fa5e82fc7273c22e05 | |
parent | 001115a6063caaebd0b4240037d9fb9f56f03ed9 (diff) | |
download | qtlocation-mapboxgl-788158cc5608bc428b13ad0ef6215626e1acaffd.tar.gz |
remove support v7
3 files changed, 7 insertions, 7 deletions
diff --git a/platform/android/MapboxGLAndroidSDK/build.gradle b/platform/android/MapboxGLAndroidSDK/build.gradle index 843836eb3b..bfb9f25ccd 100644 --- a/platform/android/MapboxGLAndroidSDK/build.gradle +++ b/platform/android/MapboxGLAndroidSDK/build.gradle @@ -10,7 +10,7 @@ dependencies { api dependenciesList.mapboxJavaGeoJSON api dependenciesList.mapboxAndroidGestures implementation dependenciesList.mapboxJavaTurf - implementation dependenciesList.supportAppcompatV7 +// implementation dependenciesList.supportAppcompatV7 implementation dependenciesList.supportAnnotations implementation dependenciesList.supportFragmentV4 implementation dependenciesList.okhttp3 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 45f72af1c5..1e604c9bef 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 @@ -6,10 +6,10 @@ 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; @@ -22,7 +22,7 @@ import com.mapbox.mapboxsdk.maps.MapboxMap; * use {@link com.mapbox.mapboxsdk.maps.UiSettings}. * </p> */ -public final class CompassView extends AppCompatImageView implements Runnable { +public final class CompassView extends ImageView 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 bd3eb92081..86f7a3fd76 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 @@ -14,15 +14,15 @@ android:layout_height="wrap_content" android:contentDescription="@string/mapbox_compassContentDescription"/> - <android.support.v7.widget.AppCompatImageView + <ImageView android:visibility="gone" android:id="@+id/logoView" android:layout_width="wrap_content" android:layout_height="wrap_content" android:contentDescription="@null" - app:srcCompat="@drawable/mapbox_logo_icon"/> + android:src="@drawable/mapbox_logo_icon"/> - <android.support.v7.widget.AppCompatImageView + <ImageView android:visibility="gone" android:id="@+id/attributionView" android:layout_width="wrap_content" @@ -31,6 +31,6 @@ android:clickable="true" android:focusable="true" android:contentDescription="@string/mapbox_attributionsIconContentDescription" - app:srcCompat="@drawable/mapbox_info_bg_selector"/> + android:src="@drawable/mapbox_info_bg_selector"/> </merge> |