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

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

Browse Source
This commit is contained in:
Curtis Belmonte
2021-05-27 01:55:58 +00:00
committed by Android (Google) Code Review
parent 1e747a593f adf0cabe0a
commit 2c8745b58d
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
res/layout/face_enroll_education.xml
View File

@@ -47,6 +47,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
app:sudVideo="@raw/face_education"/> app:sudVideo="@raw/face_education"/>
<!-- Animation res MUST be set in code, gated by config_face_education_use_lottie. -->
<com.airbnb.lottie.LottieAnimationView <com.airbnb.lottie.LottieAnimationView
android:id="@+id/illustration_lottie" android:id="@+id/illustration_lottie"
android:layout_width="match_parent" android:layout_width="match_parent"
@@ -54,8 +55,7 @@
android:scaleType="fitCenter" android:scaleType="fitCenter"
android:visibility="invisible" android:visibility="invisible"
app:lottie_autoPlay="true" app:lottie_autoPlay="true"
app:lottie_loop="true" app:lottie_loop="true" />
app:lottie_rawRes="@raw/face_education_lottie" />
<ImageView <ImageView
android:id="@+id/illustration_accessibility" android:id="@+id/illustration_accessibility"

1
src/com/android/settings/biometrics/face/FaceEnrollEducation.java
View File

@@ -112,6 +112,7 @@ public class FaceEnrollEducation extends BiometricEnrollBase {
if (mIsUsingLottie) { if (mIsUsingLottie) {
mIllustrationDefault.stop(); mIllustrationDefault.stop();
mIllustrationDefault.setVisibility(View.INVISIBLE); mIllustrationDefault.setVisibility(View.INVISIBLE);
mIllustrationLottie.setAnimation(R.raw.face_education_lottie);
mIllustrationLottie.setVisibility(View.VISIBLE); mIllustrationLottie.setVisibility(View.VISIBLE);
mIllustrationLottie.playAnimation(); mIllustrationLottie.playAnimation();
} }