diff options
| author | Leith Bade <leith@mapbox.com> | 2015-10-24 00:42:17 +1100 |
|---|---|---|
| committer | Leith Bade <leith@mapbox.com> | 2015-10-24 00:43:44 +1100 |
| commit | 4af979799479541858825ac13f4294417aecd343 (patch) | |
| tree | 6a76aa9bb23ed9f87f01d7db8524d9944750d6bf /android | |
| parent | e1d66a7aac2a9d5086689672fcc0d0209527a593 (diff) | |
| download | qtlocation-mapboxgl-4af979799479541858825ac13f4294417aecd343.tar.gz | |
[android] Use hardware layer for compass fade
Set minimum API level to 14 (don't know why it 15)
Set test app version to 2.2.0
Diffstat (limited to 'android')
3 files changed, 8 insertions, 4 deletions
diff --git a/android/java/MapboxGLAndroidSDK/gradle.properties b/android/java/MapboxGLAndroidSDK/gradle.properties index 601dba6cb2..1bbc801e48 100644 --- a/android/java/MapboxGLAndroidSDK/gradle.properties +++ b/android/java/MapboxGLAndroidSDK/gradle.properties @@ -12,7 +12,7 @@ POM_LICENCE_DIST=repo POM_DEVELOPER_ID=mapbox POM_DEVELOPER_NAME=Mapbox -ANDROID_MIN_SDK=15 +ANDROID_MIN_SDK=14 ANDROID_BUILD_TARGET_SDK_VERSION=23 ANDROID_BUILD_TOOLS_VERSION=23.0.1 ANDROID_BUILD_SDK_VERSION=23 diff --git a/android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/views/CompassView.java b/android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/views/CompassView.java index 9dc4e4897c..9ad197188f 100644 --- a/android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/views/CompassView.java +++ b/android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/views/CompassView.java @@ -3,6 +3,7 @@ package com.mapbox.mapboxsdk.views; import android.animation.Animator; import android.animation.AnimatorListenerAdapter; import android.content.Context; +import android.os.Build; import android.support.v4.content.ContextCompat; import android.util.AttributeSet; import android.view.View; @@ -107,6 +108,9 @@ final class CompassView extends ImageView { public void run() { setAlpha(1.0f); mFadeAnimator = animate().alpha(0.0f).setDuration(1000); + if (android.os.Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN) { + mFadeAnimator.withLayer(); + } mFadeAnimator.setListener(new AnimatorListenerAdapter() { @Override public void onAnimationEnd(Animator animation) { diff --git a/android/java/MapboxGLAndroidSDKTestApp/build.gradle b/android/java/MapboxGLAndroidSDKTestApp/build.gradle index 013a45c0d8..a220252fa4 100644 --- a/android/java/MapboxGLAndroidSDKTestApp/build.gradle +++ b/android/java/MapboxGLAndroidSDKTestApp/build.gradle @@ -38,10 +38,10 @@ android { defaultConfig { applicationId "com.mapbox.mapboxgl.testapp" - minSdkVersion 15 + minSdkVersion 14 targetSdkVersion 23 - versionCode 5 - versionName "0.2.0" + versionCode 6 + versionName "2.2.0" // Specify AndroidJUnitRunner as the default test instrumentation runner testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" |