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

Commit adf0cabe authored by Curtis Belmonte's avatar Curtis Belmonte
Browse files

Fix crash due to traffic light face Lottie animation 

Load the animation asset only if enabled in the resource config, to
avoid crashing on unsupported device configurations.

Test: Manual

Fixes: 189290180
Change-Id: Iae46c735277777705c1d6f4595b557e4b0b1aef7
parent c10cfff4

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();

        }