From a11c6b5a6486c9eb93f7ba717e4b0eecc7e125f9 Mon Sep 17 00:00:00 2001
From: Joshua McCloskey <joshmccloskey@google.com>
Date: Fri, 13 Jan 2023 02:28:54 +0000
Subject: [PATCH] Fixed additional lottie flicker in fp settings.

Test: Verified in fingerprint enrollment, the lotties no longer flicker
Fixes: 265194279
Change-Id: Ia88207ce7e520c6c180acdc21d03350976c10b17
---
 .../fingerprint/FingerprintEnrollEnrolling.java        | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollEnrolling.java b/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollEnrolling.java
index 2eadc33c85f..e044ab0ada7 100644
--- a/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollEnrolling.java
+++ b/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollEnrolling.java
@@ -71,6 +71,7 @@ import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
 import com.android.settingslib.display.DisplayDensityUtils;
 
 import com.airbnb.lottie.LottieAnimationView;
+import com.airbnb.lottie.LottieCompositionFactory;
 import com.airbnb.lottie.LottieProperty;
 import com.airbnb.lottie.model.KeyPath;
 import com.google.android.setupcompat.template.FooterBarMixin;
@@ -668,9 +669,12 @@ public class FingerprintEnrollEnrolling extends BiometricsEnrollEnrolling {
 
     private void configureEnrollmentStage(CharSequence description, @RawRes int lottie) {
         setDescriptionText(description);
-        mIllustrationLottie.setAnimation(lottie);
-        mIllustrationLottie.setVisibility(View.VISIBLE);
-        mIllustrationLottie.playAnimation();
+        LottieCompositionFactory.fromRawRes(this, lottie)
+                .addListener((c) -> {
+                    mIllustrationLottie.setComposition(c);
+                    mIllustrationLottie.setVisibility(View.VISIBLE);
+                    mIllustrationLottie.playAnimation();
+                });
     }
 
     @EnrollStage