Support version
diff --git a/LottieSample/src/main/kotlin/com/airbnb/lottie/samples/FontFragment.java b/LottieSample/src/main/kotlin/com/airbnb/lottie/samples/FontFragment.java
index c01e666..4e0ba45 100644
--- a/LottieSample/src/main/kotlin/com/airbnb/lottie/samples/FontFragment.java
+++ b/LottieSample/src/main/kotlin/com/airbnb/lottie/samples/FontFragment.java
@@ -1,7 +1,7 @@
package com.airbnb.lottie.samples;
import android.os.Bundle;
-import androidx.annotation.Nullable;
+import android.support.annotation.Nullable;
import androidx.fragment.app.Fragment;
import android.view.LayoutInflater;
import android.view.View;
diff --git a/LottieSample/src/main/kotlin/com/airbnb/lottie/samples/PreviewItemView.kt b/LottieSample/src/main/kotlin/com/airbnb/lottie/samples/PreviewItemView.kt
index 79f1c3c..c6830d8 100644
--- a/LottieSample/src/main/kotlin/com/airbnb/lottie/samples/PreviewItemView.kt
+++ b/LottieSample/src/main/kotlin/com/airbnb/lottie/samples/PreviewItemView.kt
@@ -1,7 +1,7 @@
package com.airbnb.lottie.samples
import android.content.Context
-import androidx.annotation.DrawableRes
+import android.support.annotation.DrawableRes
import android.util.AttributeSet
import android.view.View
import android.widget.LinearLayout
diff --git a/LottieSample/src/main/kotlin/com/airbnb/lottie/samples/TestColorFilterActivity.java b/LottieSample/src/main/kotlin/com/airbnb/lottie/samples/TestColorFilterActivity.java
index 7877cfb..c7911b2 100644
--- a/LottieSample/src/main/kotlin/com/airbnb/lottie/samples/TestColorFilterActivity.java
+++ b/LottieSample/src/main/kotlin/com/airbnb/lottie/samples/TestColorFilterActivity.java
@@ -1,7 +1,7 @@
package com.airbnb.lottie.samples;
import android.os.Bundle;
-import androidx.annotation.Nullable;
+import android.support.annotation.Nullable;
import androidx.appcompat.app.AppCompatActivity;
public class TestColorFilterActivity extends AppCompatActivity {
diff --git a/LottieSample/src/main/kotlin/com/airbnb/lottie/samples/TypeExtensions.kt b/LottieSample/src/main/kotlin/com/airbnb/lottie/samples/TypeExtensions.kt
index dcec895..125d92b 100644
--- a/LottieSample/src/main/kotlin/com/airbnb/lottie/samples/TypeExtensions.kt
+++ b/LottieSample/src/main/kotlin/com/airbnb/lottie/samples/TypeExtensions.kt
@@ -8,9 +8,9 @@
import android.os.Build
import android.os.VibrationEffect
import android.os.Vibrator
-import androidx.annotation.DrawableRes
-import androidx.annotation.LayoutRes
-import androidx.annotation.StringRes
+import android.support.annotation.DrawableRes
+import android.support.annotation.LayoutRes
+import android.support.annotation.StringRes
import com.google.android.material.snackbar.Snackbar
import androidx.vectordrawable.graphics.drawable.VectorDrawableCompat
import androidx.fragment.app.Fragment
diff --git a/LottieSample/src/main/kotlin/com/airbnb/lottie/samples/model/AnimationData.kt b/LottieSample/src/main/kotlin/com/airbnb/lottie/samples/model/AnimationData.kt
index dfca563..25b9914 100644
--- a/LottieSample/src/main/kotlin/com/airbnb/lottie/samples/model/AnimationData.kt
+++ b/LottieSample/src/main/kotlin/com/airbnb/lottie/samples/model/AnimationData.kt
@@ -2,7 +2,7 @@
import android.graphics.Color
import android.os.Parcelable
-import androidx.annotation.ColorInt
+import android.support.annotation.ColorInt
import android.util.Log
import androidx.core.graphics.toColorInt
import com.airbnb.lottie.L
diff --git a/LottieSample/src/main/kotlin/com/airbnb/lottie/samples/model/ShowcaseItem.kt b/LottieSample/src/main/kotlin/com/airbnb/lottie/samples/model/ShowcaseItem.kt
index 38c5d10..51fbf81 100644
--- a/LottieSample/src/main/kotlin/com/airbnb/lottie/samples/model/ShowcaseItem.kt
+++ b/LottieSample/src/main/kotlin/com/airbnb/lottie/samples/model/ShowcaseItem.kt
@@ -1,7 +1,7 @@
package com.airbnb.lottie.samples.model
-import androidx.annotation.DrawableRes
-import androidx.annotation.StringRes
+import android.support.annotation.DrawableRes
+import android.support.annotation.StringRes
data class ShowcaseItem(
@DrawableRes val drawableRes: Int,
diff --git a/LottieSample/src/main/kotlin/com/airbnb/lottie/samples/views/BackgroundColorView.kt b/LottieSample/src/main/kotlin/com/airbnb/lottie/samples/views/BackgroundColorView.kt
index 976c2be..5795715 100644
--- a/LottieSample/src/main/kotlin/com/airbnb/lottie/samples/views/BackgroundColorView.kt
+++ b/LottieSample/src/main/kotlin/com/airbnb/lottie/samples/views/BackgroundColorView.kt
@@ -6,7 +6,7 @@
import android.graphics.Color
import android.graphics.Paint
import android.graphics.drawable.ColorDrawable
-import androidx.annotation.ColorInt
+import android.support.annotation.ColorInt
import androidx.core.content.ContextCompat
import android.util.AttributeSet
import android.view.View
diff --git a/LottieSample/src/main/kotlin/com/airbnb/lottie/samples/views/ControlBarItemToggleView.kt b/LottieSample/src/main/kotlin/com/airbnb/lottie/samples/views/ControlBarItemToggleView.kt
index 60a1941..3fca795 100644
--- a/LottieSample/src/main/kotlin/com/airbnb/lottie/samples/views/ControlBarItemToggleView.kt
+++ b/LottieSample/src/main/kotlin/com/airbnb/lottie/samples/views/ControlBarItemToggleView.kt
@@ -2,7 +2,7 @@
import android.content.Context
import android.graphics.Color
-import androidx.annotation.DrawableRes
+import android.support.annotation.DrawableRes
import androidx.core.content.ContextCompat
import androidx.core.graphics.drawable.DrawableCompat
import android.util.AttributeSet
diff --git a/LottieSample/src/main/kotlin/com/airbnb/lottie/samples/views/FilmStripView.kt b/LottieSample/src/main/kotlin/com/airbnb/lottie/samples/views/FilmStripView.kt
index e7c3805..22f434c 100644
--- a/LottieSample/src/main/kotlin/com/airbnb/lottie/samples/views/FilmStripView.kt
+++ b/LottieSample/src/main/kotlin/com/airbnb/lottie/samples/views/FilmStripView.kt
@@ -5,7 +5,7 @@
import android.view.View
import android.view.ViewGroup
import android.widget.FrameLayout
-import androidx.annotation.FloatRange
+import android.support.annotation.FloatRange
import androidx.core.view.children
import com.airbnb.lottie.FontAssetDelegate
import com.airbnb.lottie.ImageAssetDelegate
diff --git a/gradle.properties b/gradle.properties
index 936a7b2..78dbce4 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -17,7 +17,7 @@
# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
# org.gradle.parallel=true
-VERSION_NAME=3.0.3
+VERSION_NAME=3.0.3-support
GROUP=com.airbnb.android
POM_DESCRIPTION=Lottie is an animation library that renders Adobe After Effects animations natively in realtime.
@@ -32,5 +32,5 @@
POM_DEVELOPER_NAME=Airbnb
POM_DEVELOPER_EMAIL=lottie@airbnb.com
POM_INCEPTION_YEAR=2017
-android.useAndroidX=true
-android.enableJetifier=true
\ No newline at end of file
+android.useAndroidX=false
+android.enableJetifier=false
\ No newline at end of file
diff --git a/lottie/build.gradle b/lottie/build.gradle
index 7b45e1b..2181f0f 100644
--- a/lottie/build.gradle
+++ b/lottie/build.gradle
@@ -26,7 +26,10 @@
}
dependencies {
- implementation "androidx.appcompat:appcompat:${androidXVersion}"
+ implementation "com.android.support:appcompat-v7:28.0.0"
+ implementation "com.android.support:support-v4:28.0.0"
+ implementation "com.android.support:collections:28.0.0"
+ implementation "com.android.support:support-annotations:28.0.0"
testImplementation "org.mockito:mockito-core:2.15.0"
testImplementation 'junit:junit:4.12'
testImplementation "org.robolectric:robolectric:4.0-alpha-3"
diff --git a/lottie/src/main/java/com/airbnb/lottie/ImageAssetDelegate.java b/lottie/src/main/java/com/airbnb/lottie/ImageAssetDelegate.java
index 2335ae2..6905704 100644
--- a/lottie/src/main/java/com/airbnb/lottie/ImageAssetDelegate.java
+++ b/lottie/src/main/java/com/airbnb/lottie/ImageAssetDelegate.java
@@ -1,7 +1,7 @@
package com.airbnb.lottie;
import android.graphics.Bitmap;
-import androidx.annotation.Nullable;
+import android.support.annotation.Nullable;;
/**
* Delegate to handle the loading of bitmaps that are not packaged in the assets of your app.
diff --git a/lottie/src/main/java/com/airbnb/lottie/L.java b/lottie/src/main/java/com/airbnb/lottie/L.java
index f26b6ae..46b234d 100644
--- a/lottie/src/main/java/com/airbnb/lottie/L.java
+++ b/lottie/src/main/java/com/airbnb/lottie/L.java
@@ -1,7 +1,7 @@
package com.airbnb.lottie;
-import androidx.annotation.RestrictTo;
-import androidx.core.os.TraceCompat;
+import android.support.annotation.RestrictTo;
+import android.support.v4.os.TraceCompat;
@RestrictTo(RestrictTo.Scope.LIBRARY)
public class L {
diff --git a/lottie/src/main/java/com/airbnb/lottie/LottieAnimationView.java b/lottie/src/main/java/com/airbnb/lottie/LottieAnimationView.java
index 38c3b98..a107383 100644
--- a/lottie/src/main/java/com/airbnb/lottie/LottieAnimationView.java
+++ b/lottie/src/main/java/com/airbnb/lottie/LottieAnimationView.java
@@ -11,12 +11,12 @@
import android.os.Build;
import android.os.Parcel;
import android.os.Parcelable;
-import androidx.annotation.FloatRange;
-import androidx.annotation.MainThread;
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import androidx.annotation.RawRes;
-import androidx.appcompat.widget.AppCompatImageView;
+import android.support.annotation.FloatRange;
+import android.support.annotation.MainThread;
+import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;;
+import android.support.annotation.RawRes;
+import android.support.v7.widget.AppCompatImageView;
import android.text.TextUtils;
import android.util.AttributeSet;
import android.util.JsonReader;
diff --git a/lottie/src/main/java/com/airbnb/lottie/LottieComposition.java b/lottie/src/main/java/com/airbnb/lottie/LottieComposition.java
index 4ffe434..fb6843b 100644
--- a/lottie/src/main/java/com/airbnb/lottie/LottieComposition.java
+++ b/lottie/src/main/java/com/airbnb/lottie/LottieComposition.java
@@ -3,12 +3,12 @@
import android.content.Context;
import android.content.res.Resources;
import android.graphics.Rect;
-import androidx.annotation.Nullable;
-import androidx.annotation.RawRes;
-import androidx.annotation.RestrictTo;
-import androidx.annotation.WorkerThread;
-import androidx.collection.LongSparseArray;
-import androidx.collection.SparseArrayCompat;
+import android.support.v4.util.SparseArrayCompat;
+import android.util.LongSparseArray;
+import android.support.annotation.Nullable;;
+import android.support.annotation.RawRes;
+import android.support.annotation.RestrictTo;
+import android.support.annotation.WorkerThread;
import android.util.JsonReader;
import com.airbnb.lottie.model.Font;
diff --git a/lottie/src/main/java/com/airbnb/lottie/LottieCompositionFactory.java b/lottie/src/main/java/com/airbnb/lottie/LottieCompositionFactory.java
index 15399a0..df481db 100644
--- a/lottie/src/main/java/com/airbnb/lottie/LottieCompositionFactory.java
+++ b/lottie/src/main/java/com/airbnb/lottie/LottieCompositionFactory.java
@@ -4,9 +4,9 @@
import android.content.res.Resources;
import android.graphics.Bitmap;
import android.graphics.BitmapFactory;
-import androidx.annotation.Nullable;
-import androidx.annotation.RawRes;
-import androidx.annotation.WorkerThread;
+import android.support.annotation.Nullable;;
+import android.support.annotation.RawRes;
+import android.support.annotation.WorkerThread;
import android.util.JsonReader;
import android.util.Log;
diff --git a/lottie/src/main/java/com/airbnb/lottie/LottieDrawable.java b/lottie/src/main/java/com/airbnb/lottie/LottieDrawable.java
index ace4319..2081609 100644
--- a/lottie/src/main/java/com/airbnb/lottie/LottieDrawable.java
+++ b/lottie/src/main/java/com/airbnb/lottie/LottieDrawable.java
@@ -18,12 +18,12 @@
import android.os.Build;
import android.view.View;
-import androidx.annotation.FloatRange;
-import androidx.annotation.IntDef;
-import androidx.annotation.IntRange;
-import androidx.annotation.MainThread;
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
+import android.support.annotation.FloatRange;
+import android.support.annotation.IntDef;
+import android.support.annotation.IntRange;
+import android.support.annotation.MainThread;
+import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;;
import com.airbnb.lottie.manager.FontAssetManager;
import com.airbnb.lottie.manager.ImageAssetManager;
diff --git a/lottie/src/main/java/com/airbnb/lottie/LottieImageAsset.java b/lottie/src/main/java/com/airbnb/lottie/LottieImageAsset.java
index 2c8f1d0..9cd6b76 100644
--- a/lottie/src/main/java/com/airbnb/lottie/LottieImageAsset.java
+++ b/lottie/src/main/java/com/airbnb/lottie/LottieImageAsset.java
@@ -1,8 +1,8 @@
package com.airbnb.lottie;
import android.graphics.Bitmap;
-import androidx.annotation.Nullable;
-import androidx.annotation.RestrictTo;
+import android.support.annotation.Nullable;;
+import android.support.annotation.RestrictTo;
/**
* Data class describing an image asset exported by bodymovin.
diff --git a/lottie/src/main/java/com/airbnb/lottie/LottieResult.java b/lottie/src/main/java/com/airbnb/lottie/LottieResult.java
index 5ebefe7..34ded1b 100644
--- a/lottie/src/main/java/com/airbnb/lottie/LottieResult.java
+++ b/lottie/src/main/java/com/airbnb/lottie/LottieResult.java
@@ -1,6 +1,6 @@
package com.airbnb.lottie;
-import androidx.annotation.Nullable;
+import android.support.annotation.Nullable;;
import java.util.Arrays;
diff --git a/lottie/src/main/java/com/airbnb/lottie/LottieTask.java b/lottie/src/main/java/com/airbnb/lottie/LottieTask.java
index c922228..4b29574 100644
--- a/lottie/src/main/java/com/airbnb/lottie/LottieTask.java
+++ b/lottie/src/main/java/com/airbnb/lottie/LottieTask.java
@@ -2,8 +2,8 @@
import android.os.Handler;
import android.os.Looper;
-import androidx.annotation.Nullable;
-import androidx.annotation.RestrictTo;
+import android.support.annotation.Nullable;;
+import android.support.annotation.RestrictTo;
import com.airbnb.lottie.utils.Logger;
diff --git a/lottie/src/main/java/com/airbnb/lottie/OnCompositionLoadedListener.java b/lottie/src/main/java/com/airbnb/lottie/OnCompositionLoadedListener.java
index e42956a..f3703d3 100644
--- a/lottie/src/main/java/com/airbnb/lottie/OnCompositionLoadedListener.java
+++ b/lottie/src/main/java/com/airbnb/lottie/OnCompositionLoadedListener.java
@@ -1,6 +1,6 @@
package com.airbnb.lottie;
-import androidx.annotation.Nullable;
+import android.support.annotation.Nullable;;
/**
* @see LottieCompositionFactory
diff --git a/lottie/src/main/java/com/airbnb/lottie/PerformanceTracker.java b/lottie/src/main/java/com/airbnb/lottie/PerformanceTracker.java
index e41cbff..0790dc5 100644
--- a/lottie/src/main/java/com/airbnb/lottie/PerformanceTracker.java
+++ b/lottie/src/main/java/com/airbnb/lottie/PerformanceTracker.java
@@ -1,7 +1,7 @@
package com.airbnb.lottie;
-import androidx.collection.ArraySet;
-import androidx.core.util.Pair;
+import android.support.v4.util.ArraySet;
+import android.support.v4.util.Pair;
import android.util.Log;
import com.airbnb.lottie.utils.MeanCalculator;
diff --git a/lottie/src/main/java/com/airbnb/lottie/SimpleColorFilter.java b/lottie/src/main/java/com/airbnb/lottie/SimpleColorFilter.java
index c6a21ef..30e9eb3 100644
--- a/lottie/src/main/java/com/airbnb/lottie/SimpleColorFilter.java
+++ b/lottie/src/main/java/com/airbnb/lottie/SimpleColorFilter.java
@@ -2,7 +2,7 @@
import android.graphics.PorterDuff;
import android.graphics.PorterDuffColorFilter;
-import androidx.annotation.ColorInt;
+import android.support.annotation.ColorInt;
/**
* A color filter with a predefined transfer mode that applies the specified color on top of the
diff --git a/lottie/src/main/java/com/airbnb/lottie/TextDelegate.java b/lottie/src/main/java/com/airbnb/lottie/TextDelegate.java
index 1682f97..4f7e33c 100644
--- a/lottie/src/main/java/com/airbnb/lottie/TextDelegate.java
+++ b/lottie/src/main/java/com/airbnb/lottie/TextDelegate.java
@@ -1,7 +1,7 @@
package com.airbnb.lottie;
-import androidx.annotation.Nullable;
-import androidx.annotation.VisibleForTesting;
+import android.support.annotation.Nullable;;
+import android.support.annotation.VisibleForTesting;
import java.util.HashMap;
import java.util.Map;
diff --git a/lottie/src/main/java/com/airbnb/lottie/animation/LPaint.java b/lottie/src/main/java/com/airbnb/lottie/animation/LPaint.java
index 93869aa..6a850b9 100644
--- a/lottie/src/main/java/com/airbnb/lottie/animation/LPaint.java
+++ b/lottie/src/main/java/com/airbnb/lottie/animation/LPaint.java
@@ -5,7 +5,7 @@
import android.graphics.PorterDuffXfermode;
import android.os.LocaleList;
-import androidx.annotation.NonNull;
+import android.support.annotation.NonNull;
/**
* Custom paint that doesn't set text locale.
diff --git a/lottie/src/main/java/com/airbnb/lottie/animation/content/BaseStrokeContent.java b/lottie/src/main/java/com/airbnb/lottie/animation/content/BaseStrokeContent.java
index 676ce78..fce2da4 100644
--- a/lottie/src/main/java/com/airbnb/lottie/animation/content/BaseStrokeContent.java
+++ b/lottie/src/main/java/com/airbnb/lottie/animation/content/BaseStrokeContent.java
@@ -8,8 +8,8 @@
import android.graphics.Path;
import android.graphics.PathMeasure;
import android.graphics.RectF;
-import androidx.annotation.CallSuper;
-import androidx.annotation.Nullable;
+import android.support.annotation.CallSuper;
+import android.support.annotation.Nullable;;
import com.airbnb.lottie.L;
import com.airbnb.lottie.LottieDrawable;
diff --git a/lottie/src/main/java/com/airbnb/lottie/animation/content/ContentGroup.java b/lottie/src/main/java/com/airbnb/lottie/animation/content/ContentGroup.java
index e04c201..4cfc6ed 100644
--- a/lottie/src/main/java/com/airbnb/lottie/animation/content/ContentGroup.java
+++ b/lottie/src/main/java/com/airbnb/lottie/animation/content/ContentGroup.java
@@ -4,7 +4,7 @@
import android.graphics.Matrix;
import android.graphics.Path;
import android.graphics.RectF;
-import androidx.annotation.Nullable;
+import android.support.annotation.Nullable;;
import com.airbnb.lottie.LottieDrawable;
import com.airbnb.lottie.animation.keyframe.BaseKeyframeAnimation;
diff --git a/lottie/src/main/java/com/airbnb/lottie/animation/content/EllipseContent.java b/lottie/src/main/java/com/airbnb/lottie/animation/content/EllipseContent.java
index cad538c..5715bc5 100644
--- a/lottie/src/main/java/com/airbnb/lottie/animation/content/EllipseContent.java
+++ b/lottie/src/main/java/com/airbnb/lottie/animation/content/EllipseContent.java
@@ -3,7 +3,7 @@
import android.graphics.Path;
import android.graphics.PointF;
-import androidx.annotation.Nullable;
+import android.support.annotation.Nullable;;
import com.airbnb.lottie.LottieDrawable;
import com.airbnb.lottie.LottieProperty;
diff --git a/lottie/src/main/java/com/airbnb/lottie/animation/content/FillContent.java b/lottie/src/main/java/com/airbnb/lottie/animation/content/FillContent.java
index 4e3b838..1172828 100644
--- a/lottie/src/main/java/com/airbnb/lottie/animation/content/FillContent.java
+++ b/lottie/src/main/java/com/airbnb/lottie/animation/content/FillContent.java
@@ -6,7 +6,7 @@
import android.graphics.Paint;
import android.graphics.Path;
import android.graphics.RectF;
-import androidx.annotation.Nullable;
+import android.support.annotation.Nullable;;
import com.airbnb.lottie.L;
import com.airbnb.lottie.LottieDrawable;
diff --git a/lottie/src/main/java/com/airbnb/lottie/animation/content/GradientFillContent.java b/lottie/src/main/java/com/airbnb/lottie/animation/content/GradientFillContent.java
index cfeb756..c4ab605 100644
--- a/lottie/src/main/java/com/airbnb/lottie/animation/content/GradientFillContent.java
+++ b/lottie/src/main/java/com/airbnb/lottie/animation/content/GradientFillContent.java
@@ -10,9 +10,9 @@
import android.graphics.RadialGradient;
import android.graphics.RectF;
import android.graphics.Shader;
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import androidx.collection.LongSparseArray;
+import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;;
+import android.support.v4.util.LongSparseArray;
import com.airbnb.lottie.L;
import com.airbnb.lottie.LottieDrawable;
diff --git a/lottie/src/main/java/com/airbnb/lottie/animation/content/GradientStrokeContent.java b/lottie/src/main/java/com/airbnb/lottie/animation/content/GradientStrokeContent.java
index 5f2cc56..030d510 100644
--- a/lottie/src/main/java/com/airbnb/lottie/animation/content/GradientStrokeContent.java
+++ b/lottie/src/main/java/com/airbnb/lottie/animation/content/GradientStrokeContent.java
@@ -7,8 +7,8 @@
import android.graphics.RadialGradient;
import android.graphics.RectF;
import android.graphics.Shader;
-import androidx.annotation.Nullable;
-import androidx.collection.LongSparseArray;
+import android.util.LongSparseArray;
+import android.support.annotation.Nullable;;
import com.airbnb.lottie.LottieDrawable;
import com.airbnb.lottie.LottieProperty;
diff --git a/lottie/src/main/java/com/airbnb/lottie/animation/content/PolystarContent.java b/lottie/src/main/java/com/airbnb/lottie/animation/content/PolystarContent.java
index 651511e..083b71d 100644
--- a/lottie/src/main/java/com/airbnb/lottie/animation/content/PolystarContent.java
+++ b/lottie/src/main/java/com/airbnb/lottie/animation/content/PolystarContent.java
@@ -2,7 +2,7 @@
import android.graphics.Path;
import android.graphics.PointF;
-import androidx.annotation.Nullable;
+import android.support.annotation.Nullable;;
import com.airbnb.lottie.LottieDrawable;
import com.airbnb.lottie.LottieProperty;
diff --git a/lottie/src/main/java/com/airbnb/lottie/animation/content/RectangleContent.java b/lottie/src/main/java/com/airbnb/lottie/animation/content/RectangleContent.java
index c5606e4..f5e2aeb 100644
--- a/lottie/src/main/java/com/airbnb/lottie/animation/content/RectangleContent.java
+++ b/lottie/src/main/java/com/airbnb/lottie/animation/content/RectangleContent.java
@@ -3,7 +3,7 @@
import android.graphics.Path;
import android.graphics.PointF;
import android.graphics.RectF;
-import androidx.annotation.Nullable;
+import android.support.annotation.Nullable;;
import com.airbnb.lottie.LottieDrawable;
import com.airbnb.lottie.LottieProperty;
diff --git a/lottie/src/main/java/com/airbnb/lottie/animation/content/RepeaterContent.java b/lottie/src/main/java/com/airbnb/lottie/animation/content/RepeaterContent.java
index e3f426c..a81b2e5 100644
--- a/lottie/src/main/java/com/airbnb/lottie/animation/content/RepeaterContent.java
+++ b/lottie/src/main/java/com/airbnb/lottie/animation/content/RepeaterContent.java
@@ -4,7 +4,7 @@
import android.graphics.Matrix;
import android.graphics.Path;
import android.graphics.RectF;
-import androidx.annotation.Nullable;
+import android.support.annotation.Nullable;;
import com.airbnb.lottie.LottieDrawable;
import com.airbnb.lottie.LottieProperty;
diff --git a/lottie/src/main/java/com/airbnb/lottie/animation/content/StrokeContent.java b/lottie/src/main/java/com/airbnb/lottie/animation/content/StrokeContent.java
index 55abfea..ee3bc58 100644
--- a/lottie/src/main/java/com/airbnb/lottie/animation/content/StrokeContent.java
+++ b/lottie/src/main/java/com/airbnb/lottie/animation/content/StrokeContent.java
@@ -3,7 +3,7 @@
import android.graphics.Canvas;
import android.graphics.ColorFilter;
import android.graphics.Matrix;
-import androidx.annotation.Nullable;
+import android.support.annotation.Nullable;;
import com.airbnb.lottie.LottieDrawable;
import com.airbnb.lottie.LottieProperty;
diff --git a/lottie/src/main/java/com/airbnb/lottie/animation/content/package-info.java b/lottie/src/main/java/com/airbnb/lottie/animation/content/package-info.java
index 0ef11ae..a2e92c7 100644
--- a/lottie/src/main/java/com/airbnb/lottie/animation/content/package-info.java
+++ b/lottie/src/main/java/com/airbnb/lottie/animation/content/package-info.java
@@ -1,6 +1,6 @@
@RestrictTo(LIBRARY)
package com.airbnb.lottie.animation.content;
-import androidx.annotation.RestrictTo;
+import android.support.annotation.RestrictTo;
-import static androidx.annotation.RestrictTo.Scope.LIBRARY;
\ No newline at end of file
+import static android.support.annotation.RestrictTo.Scope.LIBRARY;
\ No newline at end of file
diff --git a/lottie/src/main/java/com/airbnb/lottie/animation/keyframe/BaseKeyframeAnimation.java b/lottie/src/main/java/com/airbnb/lottie/animation/keyframe/BaseKeyframeAnimation.java
index 83813d4..cf1a475 100644
--- a/lottie/src/main/java/com/airbnb/lottie/animation/keyframe/BaseKeyframeAnimation.java
+++ b/lottie/src/main/java/com/airbnb/lottie/animation/keyframe/BaseKeyframeAnimation.java
@@ -9,8 +9,8 @@
import java.util.ArrayList;
import java.util.List;
-import androidx.annotation.FloatRange;
-import androidx.annotation.Nullable;
+import android.support.annotation.FloatRange;
+import android.support.annotation.Nullable;;
/**
* @param <K> Keyframe type
diff --git a/lottie/src/main/java/com/airbnb/lottie/animation/keyframe/PathKeyframe.java b/lottie/src/main/java/com/airbnb/lottie/animation/keyframe/PathKeyframe.java
index d9091e2..7a5207c 100644
--- a/lottie/src/main/java/com/airbnb/lottie/animation/keyframe/PathKeyframe.java
+++ b/lottie/src/main/java/com/airbnb/lottie/animation/keyframe/PathKeyframe.java
@@ -2,7 +2,7 @@
import android.graphics.Path;
import android.graphics.PointF;
-import androidx.annotation.Nullable;
+import android.support.annotation.Nullable;;
import com.airbnb.lottie.LottieComposition;
import com.airbnb.lottie.value.Keyframe;
diff --git a/lottie/src/main/java/com/airbnb/lottie/animation/keyframe/TransformKeyframeAnimation.java b/lottie/src/main/java/com/airbnb/lottie/animation/keyframe/TransformKeyframeAnimation.java
index a422cb4..853d755 100644
--- a/lottie/src/main/java/com/airbnb/lottie/animation/keyframe/TransformKeyframeAnimation.java
+++ b/lottie/src/main/java/com/airbnb/lottie/animation/keyframe/TransformKeyframeAnimation.java
@@ -2,8 +2,8 @@
import android.graphics.Matrix;
import android.graphics.PointF;
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
+import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;;
import com.airbnb.lottie.value.Keyframe;
import com.airbnb.lottie.value.LottieValueCallback;
diff --git a/lottie/src/main/java/com/airbnb/lottie/animation/keyframe/ValueCallbackKeyframeAnimation.java b/lottie/src/main/java/com/airbnb/lottie/animation/keyframe/ValueCallbackKeyframeAnimation.java
index 59ea46f..c87143b 100644
--- a/lottie/src/main/java/com/airbnb/lottie/animation/keyframe/ValueCallbackKeyframeAnimation.java
+++ b/lottie/src/main/java/com/airbnb/lottie/animation/keyframe/ValueCallbackKeyframeAnimation.java
@@ -1,6 +1,6 @@
package com.airbnb.lottie.animation.keyframe;
-import androidx.annotation.Nullable;
+import android.support.annotation.Nullable;;
import com.airbnb.lottie.value.Keyframe;
import com.airbnb.lottie.value.LottieFrameInfo;
import com.airbnb.lottie.value.LottieValueCallback;
diff --git a/lottie/src/main/java/com/airbnb/lottie/animation/keyframe/package-info.java b/lottie/src/main/java/com/airbnb/lottie/animation/keyframe/package-info.java
index fe27111..e0635e1 100644
--- a/lottie/src/main/java/com/airbnb/lottie/animation/keyframe/package-info.java
+++ b/lottie/src/main/java/com/airbnb/lottie/animation/keyframe/package-info.java
@@ -1,6 +1,6 @@
@RestrictTo(LIBRARY)
package com.airbnb.lottie.animation.keyframe;
-import androidx.annotation.RestrictTo;
+import android.support.annotation.RestrictTo;
-import static androidx.annotation.RestrictTo.Scope.LIBRARY;
\ No newline at end of file
+import static android.support.annotation.RestrictTo.Scope.LIBRARY;
\ No newline at end of file
diff --git a/lottie/src/main/java/com/airbnb/lottie/animation/package-info.java b/lottie/src/main/java/com/airbnb/lottie/animation/package-info.java
index 5b8b264..fe93824 100644
--- a/lottie/src/main/java/com/airbnb/lottie/animation/package-info.java
+++ b/lottie/src/main/java/com/airbnb/lottie/animation/package-info.java
@@ -1,6 +1,6 @@
@RestrictTo(LIBRARY)
package com.airbnb.lottie.animation;
-import androidx.annotation.RestrictTo;
+import android.support.annotation.RestrictTo;
-import static androidx.annotation.RestrictTo.Scope.LIBRARY;
\ No newline at end of file
+import static android.support.annotation.RestrictTo.Scope.LIBRARY;
\ No newline at end of file
diff --git a/lottie/src/main/java/com/airbnb/lottie/manager/FontAssetManager.java b/lottie/src/main/java/com/airbnb/lottie/manager/FontAssetManager.java
index 360893b..f8686c2 100644
--- a/lottie/src/main/java/com/airbnb/lottie/manager/FontAssetManager.java
+++ b/lottie/src/main/java/com/airbnb/lottie/manager/FontAssetManager.java
@@ -3,7 +3,7 @@
import android.content.res.AssetManager;
import android.graphics.Typeface;
import android.graphics.drawable.Drawable;
-import androidx.annotation.Nullable;
+import android.support.annotation.Nullable;;
import android.util.Log;
import android.view.View;
diff --git a/lottie/src/main/java/com/airbnb/lottie/manager/ImageAssetManager.java b/lottie/src/main/java/com/airbnb/lottie/manager/ImageAssetManager.java
index f31378d..7f1e1bd 100644
--- a/lottie/src/main/java/com/airbnb/lottie/manager/ImageAssetManager.java
+++ b/lottie/src/main/java/com/airbnb/lottie/manager/ImageAssetManager.java
@@ -4,7 +4,7 @@
import android.graphics.Bitmap;
import android.graphics.BitmapFactory;
import android.graphics.drawable.Drawable;
-import androidx.annotation.Nullable;
+import android.support.annotation.Nullable;;
import android.text.TextUtils;
import android.util.Base64;
import android.view.View;
diff --git a/lottie/src/main/java/com/airbnb/lottie/manager/package-info.java b/lottie/src/main/java/com/airbnb/lottie/manager/package-info.java
index 87a0854..69ae3b7 100644
--- a/lottie/src/main/java/com/airbnb/lottie/manager/package-info.java
+++ b/lottie/src/main/java/com/airbnb/lottie/manager/package-info.java
@@ -1,6 +1,6 @@
@RestrictTo(LIBRARY)
package com.airbnb.lottie.manager;
-import androidx.annotation.RestrictTo;
+import android.support.annotation.RestrictTo;
-import static androidx.annotation.RestrictTo.Scope.LIBRARY;
\ No newline at end of file
+import static android.support.annotation.RestrictTo.Scope.LIBRARY;
\ No newline at end of file
diff --git a/lottie/src/main/java/com/airbnb/lottie/model/CubicCurveData.java b/lottie/src/main/java/com/airbnb/lottie/model/CubicCurveData.java
index f150ff2..82d3e5a 100644
--- a/lottie/src/main/java/com/airbnb/lottie/model/CubicCurveData.java
+++ b/lottie/src/main/java/com/airbnb/lottie/model/CubicCurveData.java
@@ -1,9 +1,9 @@
package com.airbnb.lottie.model;
import android.graphics.PointF;
-import androidx.annotation.RestrictTo;
+import android.support.annotation.RestrictTo;
-import static androidx.annotation.RestrictTo.Scope.LIBRARY;
+import static android.support.annotation.RestrictTo.Scope.LIBRARY;
@RestrictTo(LIBRARY)
public class CubicCurveData {
diff --git a/lottie/src/main/java/com/airbnb/lottie/model/DocumentData.java b/lottie/src/main/java/com/airbnb/lottie/model/DocumentData.java
index a5e61f8..d4aacef 100644
--- a/lottie/src/main/java/com/airbnb/lottie/model/DocumentData.java
+++ b/lottie/src/main/java/com/airbnb/lottie/model/DocumentData.java
@@ -1,9 +1,9 @@
package com.airbnb.lottie.model;
-import androidx.annotation.ColorInt;
-import androidx.annotation.RestrictTo;
+import android.support.annotation.ColorInt;
+import android.support.annotation.RestrictTo;
-import static androidx.annotation.RestrictTo.Scope.LIBRARY;
+import static android.support.annotation.RestrictTo.Scope.LIBRARY;
@RestrictTo(LIBRARY)
public class DocumentData {
diff --git a/lottie/src/main/java/com/airbnb/lottie/model/Font.java b/lottie/src/main/java/com/airbnb/lottie/model/Font.java
index 89be53f..f5f59cf 100644
--- a/lottie/src/main/java/com/airbnb/lottie/model/Font.java
+++ b/lottie/src/main/java/com/airbnb/lottie/model/Font.java
@@ -1,8 +1,8 @@
package com.airbnb.lottie.model;
-import androidx.annotation.RestrictTo;
+import android.support.annotation.RestrictTo;
-import static androidx.annotation.RestrictTo.Scope.LIBRARY;
+import static android.support.annotation.RestrictTo.Scope.LIBRARY;
@RestrictTo(LIBRARY)
public class Font {
diff --git a/lottie/src/main/java/com/airbnb/lottie/model/FontCharacter.java b/lottie/src/main/java/com/airbnb/lottie/model/FontCharacter.java
index e09fbbd..29044d8 100644
--- a/lottie/src/main/java/com/airbnb/lottie/model/FontCharacter.java
+++ b/lottie/src/main/java/com/airbnb/lottie/model/FontCharacter.java
@@ -1,12 +1,12 @@
package com.airbnb.lottie.model;
-import androidx.annotation.RestrictTo;
+import android.support.annotation.RestrictTo;
import com.airbnb.lottie.model.content.ShapeGroup;
import java.util.List;
-import static androidx.annotation.RestrictTo.Scope.LIBRARY;
+import static android.support.annotation.RestrictTo.Scope.LIBRARY;
@RestrictTo(LIBRARY)
public class FontCharacter {
diff --git a/lottie/src/main/java/com/airbnb/lottie/model/KeyPath.java b/lottie/src/main/java/com/airbnb/lottie/model/KeyPath.java
index 31a50cf..de50652 100644
--- a/lottie/src/main/java/com/airbnb/lottie/model/KeyPath.java
+++ b/lottie/src/main/java/com/airbnb/lottie/model/KeyPath.java
@@ -1,8 +1,8 @@
package com.airbnb.lottie.model;
-import androidx.annotation.CheckResult;
-import androidx.annotation.Nullable;
-import androidx.annotation.RestrictTo;
+import android.support.annotation.CheckResult;
+import android.support.annotation.Nullable;;
+import android.support.annotation.RestrictTo;
import java.util.ArrayList;
import java.util.Arrays;
diff --git a/lottie/src/main/java/com/airbnb/lottie/model/KeyPathElement.java b/lottie/src/main/java/com/airbnb/lottie/model/KeyPathElement.java
index b3a095f..217a0c8 100644
--- a/lottie/src/main/java/com/airbnb/lottie/model/KeyPathElement.java
+++ b/lottie/src/main/java/com/airbnb/lottie/model/KeyPathElement.java
@@ -1,13 +1,13 @@
package com.airbnb.lottie.model;
-import androidx.annotation.Nullable;
-import androidx.annotation.RestrictTo;
+import android.support.annotation.Nullable;;
+import android.support.annotation.RestrictTo;
import com.airbnb.lottie.value.LottieValueCallback;
import java.util.List;
-import static androidx.annotation.RestrictTo.Scope.LIBRARY;
+import static android.support.annotation.RestrictTo.Scope.LIBRARY;
/**
* Any item that can be a part of a {@link KeyPath} should implement this.
diff --git a/lottie/src/main/java/com/airbnb/lottie/model/LottieCompositionCache.java b/lottie/src/main/java/com/airbnb/lottie/model/LottieCompositionCache.java
index 1cdcce7..692516d 100644
--- a/lottie/src/main/java/com/airbnb/lottie/model/LottieCompositionCache.java
+++ b/lottie/src/main/java/com/airbnb/lottie/model/LottieCompositionCache.java
@@ -1,9 +1,9 @@
package com.airbnb.lottie.model;
-import androidx.annotation.Nullable;
-import androidx.annotation.RestrictTo;
-import androidx.annotation.VisibleForTesting;
-import androidx.collection.LruCache;
+import android.util.LruCache;
+import android.support.annotation.Nullable;;
+import android.support.annotation.RestrictTo;
+import android.support.annotation.VisibleForTesting;
import com.airbnb.lottie.LottieComposition;
diff --git a/lottie/src/main/java/com/airbnb/lottie/model/MutablePair.java b/lottie/src/main/java/com/airbnb/lottie/model/MutablePair.java
index e116601..95bd56f 100644
--- a/lottie/src/main/java/com/airbnb/lottie/model/MutablePair.java
+++ b/lottie/src/main/java/com/airbnb/lottie/model/MutablePair.java
@@ -1,10 +1,10 @@
package com.airbnb.lottie.model;
-import androidx.annotation.Nullable;
-import androidx.annotation.RestrictTo;
-import androidx.core.util.Pair;
+import android.support.annotation.Nullable;;
+import android.support.annotation.RestrictTo;
+import android.support.v4.util.Pair;
-import static androidx.annotation.RestrictTo.Scope.LIBRARY;
+import static android.support.annotation.RestrictTo.Scope.LIBRARY;
/**
* Non final version of {@link Pair}
diff --git a/lottie/src/main/java/com/airbnb/lottie/model/animatable/AnimatableTextProperties.java b/lottie/src/main/java/com/airbnb/lottie/model/animatable/AnimatableTextProperties.java
index 1b72bb3..4f24033 100644
--- a/lottie/src/main/java/com/airbnb/lottie/model/animatable/AnimatableTextProperties.java
+++ b/lottie/src/main/java/com/airbnb/lottie/model/animatable/AnimatableTextProperties.java
@@ -1,6 +1,6 @@
package com.airbnb.lottie.model.animatable;
-import androidx.annotation.Nullable;
+import android.support.annotation.Nullable;;
public class AnimatableTextProperties {
diff --git a/lottie/src/main/java/com/airbnb/lottie/model/animatable/AnimatableTransform.java b/lottie/src/main/java/com/airbnb/lottie/model/animatable/AnimatableTransform.java
index ba5fe69..98c6110 100644
--- a/lottie/src/main/java/com/airbnb/lottie/model/animatable/AnimatableTransform.java
+++ b/lottie/src/main/java/com/airbnb/lottie/model/animatable/AnimatableTransform.java
@@ -1,7 +1,7 @@
package com.airbnb.lottie.model.animatable;
import android.graphics.PointF;
-import androidx.annotation.Nullable;
+import android.support.annotation.Nullable;;
import com.airbnb.lottie.LottieDrawable;
import com.airbnb.lottie.animation.content.Content;
import com.airbnb.lottie.animation.content.ModifierContent;
diff --git a/lottie/src/main/java/com/airbnb/lottie/model/animatable/package-info.java b/lottie/src/main/java/com/airbnb/lottie/model/animatable/package-info.java
index b64d3a6..94c9917 100644
--- a/lottie/src/main/java/com/airbnb/lottie/model/animatable/package-info.java
+++ b/lottie/src/main/java/com/airbnb/lottie/model/animatable/package-info.java
@@ -1,6 +1,6 @@
@RestrictTo(LIBRARY)
package com.airbnb.lottie.model.animatable;
-import androidx.annotation.RestrictTo;
+import android.support.annotation.RestrictTo;
-import static androidx.annotation.RestrictTo.Scope.LIBRARY;
\ No newline at end of file
+import static android.support.annotation.RestrictTo.Scope.LIBRARY;
\ No newline at end of file
diff --git a/lottie/src/main/java/com/airbnb/lottie/model/content/ContentModel.java b/lottie/src/main/java/com/airbnb/lottie/model/content/ContentModel.java
index 2e92685..c513a89 100644
--- a/lottie/src/main/java/com/airbnb/lottie/model/content/ContentModel.java
+++ b/lottie/src/main/java/com/airbnb/lottie/model/content/ContentModel.java
@@ -1,7 +1,7 @@
package com.airbnb.lottie.model.content;
-import androidx.annotation.Nullable;
+import android.support.annotation.Nullable;;
import com.airbnb.lottie.LottieDrawable;
import com.airbnb.lottie.animation.content.Content;
diff --git a/lottie/src/main/java/com/airbnb/lottie/model/content/GradientFill.java b/lottie/src/main/java/com/airbnb/lottie/model/content/GradientFill.java
index cd25721..cc3e578 100644
--- a/lottie/src/main/java/com/airbnb/lottie/model/content/GradientFill.java
+++ b/lottie/src/main/java/com/airbnb/lottie/model/content/GradientFill.java
@@ -1,7 +1,7 @@
package com.airbnb.lottie.model.content;
import android.graphics.Path;
-import androidx.annotation.Nullable;
+import android.support.annotation.Nullable;;
import com.airbnb.lottie.LottieDrawable;
import com.airbnb.lottie.animation.content.Content;
diff --git a/lottie/src/main/java/com/airbnb/lottie/model/content/GradientStroke.java b/lottie/src/main/java/com/airbnb/lottie/model/content/GradientStroke.java
index d9b27a5..afae9c0 100644
--- a/lottie/src/main/java/com/airbnb/lottie/model/content/GradientStroke.java
+++ b/lottie/src/main/java/com/airbnb/lottie/model/content/GradientStroke.java
@@ -1,6 +1,6 @@
package com.airbnb.lottie.model.content;
-import androidx.annotation.Nullable;
+import android.support.annotation.Nullable;;
import com.airbnb.lottie.LottieDrawable;
import com.airbnb.lottie.animation.content.Content;
diff --git a/lottie/src/main/java/com/airbnb/lottie/model/content/MergePaths.java b/lottie/src/main/java/com/airbnb/lottie/model/content/MergePaths.java
index 3d1184d..f936ecb 100644
--- a/lottie/src/main/java/com/airbnb/lottie/model/content/MergePaths.java
+++ b/lottie/src/main/java/com/airbnb/lottie/model/content/MergePaths.java
@@ -1,6 +1,6 @@
package com.airbnb.lottie.model.content;
-import androidx.annotation.Nullable;
+import android.support.annotation.Nullable;;
import com.airbnb.lottie.LottieDrawable;
import com.airbnb.lottie.animation.content.Content;
diff --git a/lottie/src/main/java/com/airbnb/lottie/model/content/Repeater.java b/lottie/src/main/java/com/airbnb/lottie/model/content/Repeater.java
index f8938f8..a622934 100644
--- a/lottie/src/main/java/com/airbnb/lottie/model/content/Repeater.java
+++ b/lottie/src/main/java/com/airbnb/lottie/model/content/Repeater.java
@@ -1,6 +1,6 @@
package com.airbnb.lottie.model.content;
-import androidx.annotation.Nullable;
+import android.support.annotation.Nullable;;
import com.airbnb.lottie.LottieDrawable;
import com.airbnb.lottie.animation.content.Content;
diff --git a/lottie/src/main/java/com/airbnb/lottie/model/content/ShapeData.java b/lottie/src/main/java/com/airbnb/lottie/model/content/ShapeData.java
index 5c0cdba..2b18ba3 100644
--- a/lottie/src/main/java/com/airbnb/lottie/model/content/ShapeData.java
+++ b/lottie/src/main/java/com/airbnb/lottie/model/content/ShapeData.java
@@ -1,7 +1,7 @@
package com.airbnb.lottie.model.content;
import android.graphics.PointF;
-import androidx.annotation.FloatRange;
+import android.support.annotation.FloatRange;
import com.airbnb.lottie.model.CubicCurveData;
import com.airbnb.lottie.utils.Logger;
diff --git a/lottie/src/main/java/com/airbnb/lottie/model/content/ShapeFill.java b/lottie/src/main/java/com/airbnb/lottie/model/content/ShapeFill.java
index 26e75d2..9674ff9 100644
--- a/lottie/src/main/java/com/airbnb/lottie/model/content/ShapeFill.java
+++ b/lottie/src/main/java/com/airbnb/lottie/model/content/ShapeFill.java
@@ -1,7 +1,7 @@
package com.airbnb.lottie.model.content;
import android.graphics.Path;
-import androidx.annotation.Nullable;
+import android.support.annotation.Nullable;;
import com.airbnb.lottie.LottieDrawable;
import com.airbnb.lottie.animation.content.Content;
diff --git a/lottie/src/main/java/com/airbnb/lottie/model/content/ShapeStroke.java b/lottie/src/main/java/com/airbnb/lottie/model/content/ShapeStroke.java
index 240158e..0bf506c 100644
--- a/lottie/src/main/java/com/airbnb/lottie/model/content/ShapeStroke.java
+++ b/lottie/src/main/java/com/airbnb/lottie/model/content/ShapeStroke.java
@@ -1,7 +1,7 @@
package com.airbnb.lottie.model.content;
import android.graphics.Paint;
-import androidx.annotation.Nullable;
+import android.support.annotation.Nullable;;
import com.airbnb.lottie.LottieDrawable;
import com.airbnb.lottie.animation.content.Content;
diff --git a/lottie/src/main/java/com/airbnb/lottie/model/content/package-info.java b/lottie/src/main/java/com/airbnb/lottie/model/content/package-info.java
index 4a474d3..4b31ea1 100644
--- a/lottie/src/main/java/com/airbnb/lottie/model/content/package-info.java
+++ b/lottie/src/main/java/com/airbnb/lottie/model/content/package-info.java
@@ -1,6 +1,6 @@
@RestrictTo(LIBRARY)
package com.airbnb.lottie.model.content;
-import androidx.annotation.RestrictTo;
+import android.support.annotation.RestrictTo;
-import static androidx.annotation.RestrictTo.Scope.LIBRARY;
\ No newline at end of file
+import static android.support.annotation.RestrictTo.Scope.LIBRARY;
\ No newline at end of file
diff --git a/lottie/src/main/java/com/airbnb/lottie/model/layer/BaseLayer.java b/lottie/src/main/java/com/airbnb/lottie/model/layer/BaseLayer.java
index e828ff6..88d8df7 100644
--- a/lottie/src/main/java/com/airbnb/lottie/model/layer/BaseLayer.java
+++ b/lottie/src/main/java/com/airbnb/lottie/model/layer/BaseLayer.java
@@ -3,10 +3,10 @@
import android.annotation.SuppressLint;
import android.graphics.*;
import android.os.Build;
-import androidx.annotation.CallSuper;
-import androidx.annotation.FloatRange;
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
+import android.support.annotation.CallSuper;
+import android.support.annotation.FloatRange;
+import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;;
import com.airbnb.lottie.L;
import com.airbnb.lottie.LottieComposition;
import com.airbnb.lottie.LottieDrawable;
diff --git a/lottie/src/main/java/com/airbnb/lottie/model/layer/CompositionLayer.java b/lottie/src/main/java/com/airbnb/lottie/model/layer/CompositionLayer.java
index b8827a7..a40e342 100644
--- a/lottie/src/main/java/com/airbnb/lottie/model/layer/CompositionLayer.java
+++ b/lottie/src/main/java/com/airbnb/lottie/model/layer/CompositionLayer.java
@@ -3,9 +3,9 @@
import android.graphics.Canvas;
import android.graphics.Matrix;
import android.graphics.RectF;
-import androidx.annotation.FloatRange;
-import androidx.annotation.Nullable;
-import androidx.collection.LongSparseArray;
+import android.support.annotation.FloatRange;
+import android.support.annotation.Nullable;;
+import android.support.v4.util.LongSparseArray;
import com.airbnb.lottie.L;
import com.airbnb.lottie.LottieComposition;
diff --git a/lottie/src/main/java/com/airbnb/lottie/model/layer/ImageLayer.java b/lottie/src/main/java/com/airbnb/lottie/model/layer/ImageLayer.java
index f7e9186..68c54ae 100644
--- a/lottie/src/main/java/com/airbnb/lottie/model/layer/ImageLayer.java
+++ b/lottie/src/main/java/com/airbnb/lottie/model/layer/ImageLayer.java
@@ -7,8 +7,8 @@
import android.graphics.Paint;
import android.graphics.Rect;
import android.graphics.RectF;
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
+import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;;
import com.airbnb.lottie.LottieDrawable;
import com.airbnb.lottie.LottieProperty;
diff --git a/lottie/src/main/java/com/airbnb/lottie/model/layer/Layer.java b/lottie/src/main/java/com/airbnb/lottie/model/layer/Layer.java
index 5f42150..84fe9cd 100644
--- a/lottie/src/main/java/com/airbnb/lottie/model/layer/Layer.java
+++ b/lottie/src/main/java/com/airbnb/lottie/model/layer/Layer.java
@@ -1,6 +1,6 @@
package com.airbnb.lottie.model.layer;
-import androidx.annotation.Nullable;
+import android.support.annotation.Nullable;;
import com.airbnb.lottie.LottieComposition;
import com.airbnb.lottie.value.Keyframe;
diff --git a/lottie/src/main/java/com/airbnb/lottie/model/layer/ShapeLayer.java b/lottie/src/main/java/com/airbnb/lottie/model/layer/ShapeLayer.java
index eeea415..6944077 100644
--- a/lottie/src/main/java/com/airbnb/lottie/model/layer/ShapeLayer.java
+++ b/lottie/src/main/java/com/airbnb/lottie/model/layer/ShapeLayer.java
@@ -3,7 +3,7 @@
import android.graphics.Canvas;
import android.graphics.Matrix;
import android.graphics.RectF;
-import androidx.annotation.NonNull;
+import android.support.annotation.NonNull;
import com.airbnb.lottie.LottieDrawable;
import com.airbnb.lottie.animation.content.Content;
diff --git a/lottie/src/main/java/com/airbnb/lottie/model/layer/SolidLayer.java b/lottie/src/main/java/com/airbnb/lottie/model/layer/SolidLayer.java
index 73f85f6..3c57a0f 100644
--- a/lottie/src/main/java/com/airbnb/lottie/model/layer/SolidLayer.java
+++ b/lottie/src/main/java/com/airbnb/lottie/model/layer/SolidLayer.java
@@ -7,7 +7,7 @@
import android.graphics.Paint;
import android.graphics.Path;
import android.graphics.RectF;
-import androidx.annotation.Nullable;
+import android.support.annotation.Nullable;;
import com.airbnb.lottie.LottieDrawable;
import com.airbnb.lottie.LottieProperty;
diff --git a/lottie/src/main/java/com/airbnb/lottie/model/layer/TextLayer.java b/lottie/src/main/java/com/airbnb/lottie/model/layer/TextLayer.java
index ab45531..46e328e 100644
--- a/lottie/src/main/java/com/airbnb/lottie/model/layer/TextLayer.java
+++ b/lottie/src/main/java/com/airbnb/lottie/model/layer/TextLayer.java
@@ -7,8 +7,8 @@
import android.graphics.Path;
import android.graphics.RectF;
import android.graphics.Typeface;
-import androidx.annotation.Nullable;
-import androidx.collection.LongSparseArray;
+import android.support.annotation.Nullable;;
+import android.support.v4.util.LongSparseArray;
import com.airbnb.lottie.LottieComposition;
import com.airbnb.lottie.LottieDrawable;
import com.airbnb.lottie.LottieProperty;
diff --git a/lottie/src/main/java/com/airbnb/lottie/model/layer/package-info.java b/lottie/src/main/java/com/airbnb/lottie/model/layer/package-info.java
index 58db6e7..8cf047b 100644
--- a/lottie/src/main/java/com/airbnb/lottie/model/layer/package-info.java
+++ b/lottie/src/main/java/com/airbnb/lottie/model/layer/package-info.java
@@ -1,6 +1,6 @@
@RestrictTo(LIBRARY)
package com.airbnb.lottie.model.layer;
-import androidx.annotation.RestrictTo;
+import android.support.annotation.RestrictTo;
-import static androidx.annotation.RestrictTo.Scope.LIBRARY;
\ No newline at end of file
+import static android.support.annotation.RestrictTo.Scope.LIBRARY;
\ No newline at end of file
diff --git a/lottie/src/main/java/com/airbnb/lottie/network/NetworkCache.java b/lottie/src/main/java/com/airbnb/lottie/network/NetworkCache.java
index dc8e5bd..9aa3dff 100644
--- a/lottie/src/main/java/com/airbnb/lottie/network/NetworkCache.java
+++ b/lottie/src/main/java/com/airbnb/lottie/network/NetworkCache.java
@@ -1,9 +1,9 @@
package com.airbnb.lottie.network;
import android.content.Context;
-import androidx.annotation.Nullable;
-import androidx.annotation.WorkerThread;
-import androidx.core.util.Pair;
+import android.support.v4.util.Pair;
+import android.support.annotation.Nullable;
+import android.support.annotation.WorkerThread;
import com.airbnb.lottie.utils.Logger;
diff --git a/lottie/src/main/java/com/airbnb/lottie/network/NetworkFetcher.java b/lottie/src/main/java/com/airbnb/lottie/network/NetworkFetcher.java
index c3d31c7..39e1e0a 100644
--- a/lottie/src/main/java/com/airbnb/lottie/network/NetworkFetcher.java
+++ b/lottie/src/main/java/com/airbnb/lottie/network/NetworkFetcher.java
@@ -1,9 +1,9 @@
package com.airbnb.lottie.network;
import android.content.Context;
-import androidx.annotation.Nullable;
-import androidx.annotation.WorkerThread;
-import androidx.core.util.Pair;
+import android.support.annotation.Nullable;;
+import android.support.annotation.WorkerThread;
+import android.support.v4.util.Pair;
import com.airbnb.lottie.LottieComposition;
import com.airbnb.lottie.LottieCompositionFactory;
diff --git a/lottie/src/main/java/com/airbnb/lottie/network/package-info.java b/lottie/src/main/java/com/airbnb/lottie/network/package-info.java
index 7a014de..b85ad1b 100644
--- a/lottie/src/main/java/com/airbnb/lottie/network/package-info.java
+++ b/lottie/src/main/java/com/airbnb/lottie/network/package-info.java
@@ -1,6 +1,6 @@
@RestrictTo(LIBRARY)
package com.airbnb.lottie.network;
-import androidx.annotation.RestrictTo;
+import android.support.annotation.RestrictTo;
-import static androidx.annotation.RestrictTo.Scope.LIBRARY;
\ No newline at end of file
+import static android.support.annotation.RestrictTo.Scope.LIBRARY;
\ No newline at end of file
diff --git a/lottie/src/main/java/com/airbnb/lottie/parser/AnimatableValueParser.java b/lottie/src/main/java/com/airbnb/lottie/parser/AnimatableValueParser.java
index b836aad..f7d51fc 100644
--- a/lottie/src/main/java/com/airbnb/lottie/parser/AnimatableValueParser.java
+++ b/lottie/src/main/java/com/airbnb/lottie/parser/AnimatableValueParser.java
@@ -1,6 +1,6 @@
package com.airbnb.lottie.parser;
-import androidx.annotation.Nullable;
+import android.support.annotation.Nullable;;
import android.util.JsonReader;
import com.airbnb.lottie.LottieComposition;
diff --git a/lottie/src/main/java/com/airbnb/lottie/parser/ContentModelParser.java b/lottie/src/main/java/com/airbnb/lottie/parser/ContentModelParser.java
index f2430d4..5bc67f2 100644
--- a/lottie/src/main/java/com/airbnb/lottie/parser/ContentModelParser.java
+++ b/lottie/src/main/java/com/airbnb/lottie/parser/ContentModelParser.java
@@ -1,6 +1,6 @@
package com.airbnb.lottie.parser;
-import androidx.annotation.Nullable;
+import android.support.annotation.Nullable;;
import android.util.JsonReader;
import com.airbnb.lottie.LottieComposition;
diff --git a/lottie/src/main/java/com/airbnb/lottie/parser/GradientColorParser.java b/lottie/src/main/java/com/airbnb/lottie/parser/GradientColorParser.java
index b330693..e53bfdb 100644
--- a/lottie/src/main/java/com/airbnb/lottie/parser/GradientColorParser.java
+++ b/lottie/src/main/java/com/airbnb/lottie/parser/GradientColorParser.java
@@ -1,7 +1,7 @@
package com.airbnb.lottie.parser;
import android.graphics.Color;
-import androidx.annotation.IntRange;
+import android.support.annotation.IntRange;
import android.util.JsonReader;
import android.util.JsonToken;
diff --git a/lottie/src/main/java/com/airbnb/lottie/parser/JsonUtils.java b/lottie/src/main/java/com/airbnb/lottie/parser/JsonUtils.java
index 26b38dc..e469caf 100644
--- a/lottie/src/main/java/com/airbnb/lottie/parser/JsonUtils.java
+++ b/lottie/src/main/java/com/airbnb/lottie/parser/JsonUtils.java
@@ -2,7 +2,7 @@
import android.graphics.Color;
import android.graphics.PointF;
-import androidx.annotation.ColorInt;
+import android.support.annotation.ColorInt;
import android.util.JsonReader;
import android.util.JsonToken;
diff --git a/lottie/src/main/java/com/airbnb/lottie/parser/KeyframeParser.java b/lottie/src/main/java/com/airbnb/lottie/parser/KeyframeParser.java
index 72ed856..1a25446 100644
--- a/lottie/src/main/java/com/airbnb/lottie/parser/KeyframeParser.java
+++ b/lottie/src/main/java/com/airbnb/lottie/parser/KeyframeParser.java
@@ -1,9 +1,9 @@
package com.airbnb.lottie.parser;
import android.graphics.PointF;
-import androidx.annotation.Nullable;
-import androidx.collection.SparseArrayCompat;
-import androidx.core.view.animation.PathInterpolatorCompat;
+import android.support.annotation.Nullable;;
+import android.support.v4.util.SparseArrayCompat;
+import android.support.v4.view.animation.PathInterpolatorCompat;
import android.util.JsonReader;
import android.view.animation.Interpolator;
import android.view.animation.LinearInterpolator;
diff --git a/lottie/src/main/java/com/airbnb/lottie/parser/LottieCompositionParser.java b/lottie/src/main/java/com/airbnb/lottie/parser/LottieCompositionParser.java
index afe8f2d..b9a101a 100644
--- a/lottie/src/main/java/com/airbnb/lottie/parser/LottieCompositionParser.java
+++ b/lottie/src/main/java/com/airbnb/lottie/parser/LottieCompositionParser.java
@@ -1,10 +1,10 @@
package com.airbnb.lottie.parser;
import android.graphics.Rect;
-import androidx.collection.LongSparseArray;
-import androidx.collection.SparseArrayCompat;
+import android.support.v4.util.SparseArrayCompat;
import android.util.JsonReader;
+import android.util.LongSparseArray;
import com.airbnb.lottie.LottieComposition;
import com.airbnb.lottie.LottieImageAsset;
import com.airbnb.lottie.model.Font;
diff --git a/lottie/src/main/java/com/airbnb/lottie/parser/package-info.java b/lottie/src/main/java/com/airbnb/lottie/parser/package-info.java
index fa7edd8..729a574 100644
--- a/lottie/src/main/java/com/airbnb/lottie/parser/package-info.java
+++ b/lottie/src/main/java/com/airbnb/lottie/parser/package-info.java
@@ -1,6 +1,6 @@
@RestrictTo(LIBRARY)
package com.airbnb.lottie.parser;
-import androidx.annotation.RestrictTo;
+import android.support.annotation.RestrictTo;
-import static androidx.annotation.RestrictTo.Scope.LIBRARY;
\ No newline at end of file
+import static android.support.annotation.RestrictTo.Scope.LIBRARY;
\ No newline at end of file
diff --git a/lottie/src/main/java/com/airbnb/lottie/utils/LottieValueAnimator.java b/lottie/src/main/java/com/airbnb/lottie/utils/LottieValueAnimator.java
index 57c1dfa..bafd6ee 100644
--- a/lottie/src/main/java/com/airbnb/lottie/utils/LottieValueAnimator.java
+++ b/lottie/src/main/java/com/airbnb/lottie/utils/LottieValueAnimator.java
@@ -1,10 +1,10 @@
package com.airbnb.lottie.utils;
import android.animation.ValueAnimator;
-import androidx.annotation.FloatRange;
-import androidx.annotation.MainThread;
-import androidx.annotation.Nullable;
-import androidx.annotation.VisibleForTesting;
+import android.support.annotation.FloatRange;
+import android.support.annotation.MainThread;
+import android.support.annotation.Nullable;;
+import android.support.annotation.VisibleForTesting;
import android.view.Choreographer;
import com.airbnb.lottie.LottieComposition;
diff --git a/lottie/src/main/java/com/airbnb/lottie/utils/MiscUtils.java b/lottie/src/main/java/com/airbnb/lottie/utils/MiscUtils.java
index 01e34da..779e356 100644
--- a/lottie/src/main/java/com/airbnb/lottie/utils/MiscUtils.java
+++ b/lottie/src/main/java/com/airbnb/lottie/utils/MiscUtils.java
@@ -2,7 +2,7 @@
import android.graphics.Path;
import android.graphics.PointF;
-import androidx.annotation.FloatRange;
+import android.support.annotation.FloatRange;
import com.airbnb.lottie.animation.content.KeyPathElementContent;
import com.airbnb.lottie.model.CubicCurveData;
diff --git a/lottie/src/main/java/com/airbnb/lottie/utils/Utils.java b/lottie/src/main/java/com/airbnb/lottie/utils/Utils.java
index 83110b2..da9b502 100644
--- a/lottie/src/main/java/com/airbnb/lottie/utils/Utils.java
+++ b/lottie/src/main/java/com/airbnb/lottie/utils/Utils.java
@@ -14,7 +14,7 @@
import android.os.Build;
import android.provider.Settings;
-import androidx.annotation.Nullable;
+import android.support.annotation.Nullable;;
import com.airbnb.lottie.L;
import com.airbnb.lottie.animation.LPaint;
diff --git a/lottie/src/main/java/com/airbnb/lottie/utils/package-info.java b/lottie/src/main/java/com/airbnb/lottie/utils/package-info.java
index 7bf2a4c..2b4efe8 100644
--- a/lottie/src/main/java/com/airbnb/lottie/utils/package-info.java
+++ b/lottie/src/main/java/com/airbnb/lottie/utils/package-info.java
@@ -1,6 +1,6 @@
@RestrictTo(LIBRARY)
package com.airbnb.lottie.utils;
-import androidx.annotation.RestrictTo;
+import android.support.annotation.RestrictTo;
-import static androidx.annotation.RestrictTo.Scope.LIBRARY;
\ No newline at end of file
+import static android.support.annotation.RestrictTo.Scope.LIBRARY;
\ No newline at end of file
diff --git a/lottie/src/main/java/com/airbnb/lottie/value/Keyframe.java b/lottie/src/main/java/com/airbnb/lottie/value/Keyframe.java
index fa58a43..dab8d95 100644
--- a/lottie/src/main/java/com/airbnb/lottie/value/Keyframe.java
+++ b/lottie/src/main/java/com/airbnb/lottie/value/Keyframe.java
@@ -1,8 +1,8 @@
package com.airbnb.lottie.value;
import android.graphics.PointF;
-import androidx.annotation.FloatRange;
-import androidx.annotation.Nullable;
+import android.support.annotation.FloatRange;
+import android.support.annotation.Nullable;;
import android.view.animation.Interpolator;
import com.airbnb.lottie.LottieComposition;
diff --git a/lottie/src/main/java/com/airbnb/lottie/value/LottieFrameInfo.java b/lottie/src/main/java/com/airbnb/lottie/value/LottieFrameInfo.java
index 95f80df..231decc 100644
--- a/lottie/src/main/java/com/airbnb/lottie/value/LottieFrameInfo.java
+++ b/lottie/src/main/java/com/airbnb/lottie/value/LottieFrameInfo.java
@@ -1,6 +1,6 @@
package com.airbnb.lottie.value;
-import androidx.annotation.RestrictTo;
+import android.support.annotation.RestrictTo;
/**
* Data class for use with {@link LottieValueCallback}.
diff --git a/lottie/src/main/java/com/airbnb/lottie/value/LottieRelativeFloatValueCallback.java b/lottie/src/main/java/com/airbnb/lottie/value/LottieRelativeFloatValueCallback.java
index cd22a42..a2db77e 100644
--- a/lottie/src/main/java/com/airbnb/lottie/value/LottieRelativeFloatValueCallback.java
+++ b/lottie/src/main/java/com/airbnb/lottie/value/LottieRelativeFloatValueCallback.java
@@ -1,6 +1,6 @@
package com.airbnb.lottie.value;
-import androidx.annotation.NonNull;
+import android.support.annotation.NonNull;
import com.airbnb.lottie.utils.MiscUtils;
diff --git a/lottie/src/main/java/com/airbnb/lottie/value/LottieRelativePointValueCallback.java b/lottie/src/main/java/com/airbnb/lottie/value/LottieRelativePointValueCallback.java
index f0a7446..ed49510 100644
--- a/lottie/src/main/java/com/airbnb/lottie/value/LottieRelativePointValueCallback.java
+++ b/lottie/src/main/java/com/airbnb/lottie/value/LottieRelativePointValueCallback.java
@@ -1,7 +1,7 @@
package com.airbnb.lottie.value;
import android.graphics.PointF;
-import androidx.annotation.NonNull;
+import android.support.annotation.NonNull;
import com.airbnb.lottie.utils.MiscUtils;
diff --git a/lottie/src/main/java/com/airbnb/lottie/value/LottieValueCallback.java b/lottie/src/main/java/com/airbnb/lottie/value/LottieValueCallback.java
index 6e3354b..a2fb861 100644
--- a/lottie/src/main/java/com/airbnb/lottie/value/LottieValueCallback.java
+++ b/lottie/src/main/java/com/airbnb/lottie/value/LottieValueCallback.java
@@ -1,8 +1,8 @@
package com.airbnb.lottie.value;
-import androidx.annotation.Nullable;
-import androidx.annotation.RestrictTo;
+import android.support.annotation.Nullable;;
+import android.support.annotation.RestrictTo;
import com.airbnb.lottie.animation.keyframe.BaseKeyframeAnimation;
diff --git a/lottie/src/test/java/com/airbnb/lottie/LottieDrawableTest.java b/lottie/src/test/java/com/airbnb/lottie/LottieDrawableTest.java
index 263d5f9..e617c2e 100644
--- a/lottie/src/test/java/com/airbnb/lottie/LottieDrawableTest.java
+++ b/lottie/src/test/java/com/airbnb/lottie/LottieDrawableTest.java
@@ -1,8 +1,8 @@
package com.airbnb.lottie;
import android.graphics.Rect;
-import androidx.collection.LongSparseArray;
-import androidx.collection.SparseArrayCompat;
+import android.support.v4.util.LongSparseArray;
+import android.support.v4.util.SparseArrayCompat;
import com.airbnb.lottie.model.Font;
import com.airbnb.lottie.model.FontCharacter;
import com.airbnb.lottie.model.Marker;
diff --git a/lottie/src/test/java/com/airbnb/lottie/LottieValueAnimatorUnitTest.java b/lottie/src/test/java/com/airbnb/lottie/LottieValueAnimatorUnitTest.java
index 08b0b8c..a095b68 100644
--- a/lottie/src/test/java/com/airbnb/lottie/LottieValueAnimatorUnitTest.java
+++ b/lottie/src/test/java/com/airbnb/lottie/LottieValueAnimatorUnitTest.java
@@ -3,8 +3,8 @@
import android.animation.Animator;
import android.animation.AnimatorListenerAdapter;
import android.graphics.Rect;
-import androidx.collection.LongSparseArray;
-import androidx.collection.SparseArrayCompat;
+import android.support.v4.util.LongSparseArray;
+import android.support.v4.util.SparseArrayCompat;
import com.airbnb.lottie.model.Font;
import com.airbnb.lottie.model.FontCharacter;
import com.airbnb.lottie.model.Marker;
diff --git a/lottie/src/test/java/com/airbnb/lottie/PerformanceTrackerTest.java b/lottie/src/test/java/com/airbnb/lottie/PerformanceTrackerTest.java
index f6f0bc2..c71419d 100644
--- a/lottie/src/test/java/com/airbnb/lottie/PerformanceTrackerTest.java
+++ b/lottie/src/test/java/com/airbnb/lottie/PerformanceTrackerTest.java
@@ -1,6 +1,6 @@
package com.airbnb.lottie;
-import androidx.core.util.Pair;
+import android.support.v4.util.Pair;
import org.junit.Before;
import org.junit.Test;
