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

Commit 2c8745b5 authored by Curtis Belmonte's avatar Curtis Belmonte Committed by Android (Google) Code Review
Browse files

Merge "Fix crash due to traffic light face Lottie animation" into sc-dev

parents 1e747a59 adf0cabe

res/layout/face_enroll_education.xml

+2 −2
Original line number Diff line number Diff line
@@ -47,6 +47,7 @@ 
                android:layout_height="wrap_content"

                app:sudVideo="@raw/face_education"/>



            <!-- Animation res MUST be set in code, gated by config_face_education_use_lottie. -->

            <com.airbnb.lottie.LottieAnimationView

                android:id="@+id/illustration_lottie"

                android:layout_width="match_parent"
@@ -54,8 +55,7 @@ 
                android:scaleType="fitCenter"

                android:visibility="invisible"

                app:lottie_autoPlay="true"

                app:lottie_loop="true"

                app:lottie_rawRes="@raw/face_education_lottie" />

                app:lottie_loop="true" />



            <ImageView

                android:id="@+id/illustration_accessibility"

src/com/android/settings/biometrics/face/FaceEnrollEducation.java

+1 −0
Original line number Diff line number Diff line
@@ -112,6 +112,7 @@ public class FaceEnrollEducation extends BiometricEnrollBase { 
        if (mIsUsingLottie) {

            mIllustrationDefault.stop();

            mIllustrationDefault.setVisibility(View.INVISIBLE);

            mIllustrationLottie.setAnimation(R.raw.face_education_lottie);

            mIllustrationLottie.setVisibility(View.VISIBLE);

            mIllustrationLottie.playAnimation();

        }