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

Commit 5c1e5654 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:... 

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

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



Change-Id: Ia0224ca7f2ae208b4e28555470941a6f7c91c753
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents c8445a03 6f9ddeb6

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

+7 −3
Original line number Diff line number Diff line
@@ -79,6 +79,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;
@@ -723,9 +724,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