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

Merge cherrypicks of [14740967, 14741245, 14741024, 14740327, 14740328, 14740329, 14741350, 14741106, 14741246, 14741247, 14741186, 14741107, 14740385, 14740386, 14740751, 14741025, 14741188, 14741370] into sc-release

Browse Source 
Change-Id: I0e6b0458f907a9d14a972659555d582b0bc342ef
This commit is contained in:
android-build-team Robot
2021-05-27 00:24:10 +00:00
parent cc2b0bc49e 1ed87faa2a
commit 08687ecf56
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();
} }