Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6f9ddeb6 authored by Joshua Mccloskey's avatar Joshua Mccloskey Committed by Automerger Merge Worker
Browse files

Merge "Fixed additional lottie flicker in fp settings." into tm-qpr-dev am: 0dd635f2 

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20950039



Change-Id: Ia48a9d9e4214f18ac8e053e1137603bc84807f85
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents fd4ecf54 0dd635f2

src/com/android/settings/biometrics/fingerprint/FingerprintEnrollEnrolling.java

+7 −3
Original line number Diff line number Diff line
@@ -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);

        LottieCompositionFactory.fromRawRes(this, lottie)

                .addListener((c) -> {

                    mIllustrationLottie.setComposition(c);

                    mIllustrationLottie.setVisibility(View.VISIBLE);

                    mIllustrationLottie.playAnimation();

                });

    }



    @EnrollStage