Merge "Fixed additional lottie flicker in fp settings." into tm-qpr-dev

This commit is contained in:
Joshua Mccloskey
2023-01-17 19:35:31 +00:00
committed by Android (Google) Code Review

View File

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