commit f2d6e608637684b0a957370fe0edb4be7bf93652
author Gabriel Peal <gpeal@users.noreply.github.com> Thu Jun 13 12:10:32 2019 -0700
committer GitHub <noreply@github.com> Thu Jun 13 12:10:32 2019 -0700
tree cf7ae2177a1b21bca8fda382b4f2a6ddec53ba94
parent 35de50dd3bbe1b11aa6e983209c26ec0bd99d359

Fixed renderMode attr (#1263)

Somehow this was never implemented when adding the renderMode API
#1254

lottie/src/main/java/com/airbnb/lottie/LottieAnimationView.java

diff --git a/lottie/src/main/java/com/airbnb/lottie/LottieAnimationView.java b/lottie/src/main/java/com/airbnb/lottie/LottieAnimationView.java
index 41c4237..c79b29b 100644
--- a/lottie/src/main/java/com/airbnb/lottie/LottieAnimationView.java
+++ b/lottie/src/main/java/com/airbnb/lottie/LottieAnimationView.java
@@ -168,6 +168,14 @@
       lottieDrawable.setScale(ta.getFloat(R.styleable.LottieAnimationView_lottie_scale, 1f));
     }
 
+    if (ta.hasValue(R.styleable.LottieAnimationView_lottie_renderMode)) {
+      int renderModeOrdinal = ta.getInt(R.styleable.LottieAnimationView_lottie_renderMode, RenderMode.AUTOMATIC.ordinal());
+      if (renderModeOrdinal >= RenderMode.values().length) {
+        renderModeOrdinal = RenderMode.AUTOMATIC.ordinal();
+      }
+      renderMode = RenderMode.values()[renderModeOrdinal];
+    }
+
     ta.recycle();
 
     lottieDrawable.setSystemAnimationsAreEnabled(Utils.getAnimationScale(getContext()) != 0f);
@@ -861,12 +869,13 @@
   }
 
   private void enableOrDisableHardwareLayer() {
+    int layerType = LAYER_TYPE_SOFTWARE;
     switch (renderMode) {
       case HARDWARE:
-        setLayerType(LAYER_TYPE_HARDWARE, null);
+        layerType = LAYER_TYPE_HARDWARE;
         break;
       case SOFTWARE:
-        setLayerType(LAYER_TYPE_SOFTWARE, null);
+        layerType = LAYER_TYPE_SOFTWARE;
         break;
       case AUTOMATIC:
         boolean useHardwareLayer = true;
@@ -874,11 +883,15 @@
           useHardwareLayer = false;
         } else if (composition != null && composition.getMaskAndMatteCount() > 4) {
           useHardwareLayer = false;
+        } else if (Build.VERSION.SDK_INT < Build.VERSION_CODES.LOLLIPOP) {
+          useHardwareLayer = false;
         }
-        setLayerType(useHardwareLayer ? LAYER_TYPE_HARDWARE : LAYER_TYPE_SOFTWARE, null);
+        layerType = useHardwareLayer ? LAYER_TYPE_HARDWARE : LAYER_TYPE_SOFTWARE;
         break;
     }
-
+    if (layerType != getLayerType()) {
+      setLayerType(layerType, null);
+    }
   }
 
   public boolean addLottieOnCompositionLoadedListener(@NonNull LottieOnCompositionLoadedListener lottieOnCompositionLoadedListener) {