PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

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

Change-Id: Ia0224ca7f2ae208b4e28555470941a6f7c91c753
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Joshua Mccloskey
2023-01-17 21:14:32 +00:00
committed by Automerger Merge Worker
parent c8445a03d4 6f9ddeb66f
commit 5c1e565470
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/com/android/settings/biometrics/fingerprint/FingerprintEnrollEnrolling.java
View File

@@ -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);
mIllustrationLottie.setVisibility(View.VISIBLE);
mIllustrationLottie.playAnimation();
LottieCompositionFactory.fromRawRes(this, lottie)
.addListener((c) -> {
mIllustrationLottie.setComposition(c);
mIllustrationLottie.setVisibility(View.VISIBLE);
mIllustrationLottie.playAnimation();
});
}
@EnrollStage