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

Commit 204c86a3 authored by Jason Chang's avatar Jason Chang
Browse files

Update for applying theme color illustration lottie for Face Education 

- Add applyIllustrationLottieThemeColor() in BiometricUtils

Flag: EXEMPT resource customization

Bug: 379858655

Test: atest FaceEnrollEducationTest
Test: Lottie animation updated on 2025 devices
Change-Id: I9ada64098b21653f9c5385464293d22db9f94bae
parent d419986d

res/layout/face_enroll_education.xml

+1 −0
Original line number Diff line number Diff line
@@ -51,6 +51,7 @@ 
            <!-- Animation res MUST be set in code, gated by config_face_education_use_lottie. -->

            <com.airbnb.lottie.LottieAnimationView

                android:id="@+id/illustration_lottie"

                style="@style/SudContentIllustration"

                android:layout_width="match_parent"

                android:layout_height="@dimen/illustration_lottie_height"

                android:layout_marginTop="@dimen/lottie_animation_view_margin_top"

src/com/android/settings/biometrics/BiometricUtils.java

+18 −0
Original line number Diff line number Diff line
@@ -54,11 +54,16 @@ import com.android.settings.password.ChooseLockSettingsHelper; 
import com.android.settings.password.SetupChooseLockGeneric;

import com.android.settingslib.widget.SettingsThemeHelper;



import com.airbnb.lottie.LottieAnimationView;

import com.google.android.setupcompat.util.WizardManagerHelper;

import com.google.android.setupdesign.util.LottieAnimationHelper;

import com.google.android.setupdesign.util.ThemeHelper;



import java.lang.annotation.Retention;

import java.lang.annotation.RetentionPolicy;

import java.util.ArrayList;

import java.util.Collections;

import java.util.List;



/**

 * Common biometric utilities.
@@ -563,6 +568,19 @@ public class BiometricUtils { 
        }

    }



    /**

     * Apply illustration theme color for LottieAnimationView view.

     * @param context that for applying theme color of LottieAnimationView

     * @param illustrationView the LottieAnimationView

     */

    public static void applyIllustrationLottieThemeColor(@NonNull Context context,

            @NonNull LottieAnimationView illustrationView) {

        List<String> colorResult = new ArrayList<>();

        Collections.addAll(colorResult, context.getResources().getStringArray(

                com.android.settings.R.array.va_animation_customization));

        LottieAnimationHelper.get().applyColor(context, illustrationView, colorResult);

    }



    private static String capitalize(final String input) {

        return Character.toUpperCase(input.charAt(0)) + input.substring(1);

    }

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

+4 −0
Original line number Diff line number Diff line
@@ -121,6 +121,10 @@ public class FaceEnrollEducation extends BiometricEnrollBase { 


        mIllustrationDefault = findViewById(R.id.illustration_default);

        mIllustrationLottie = findViewById(R.id.illustration_lottie);

        if (BiometricUtils.useExpressiveStyle(this, getIntent())) {

            BiometricUtils.applyIllustrationLottieThemeColor(

                    getApplicationContext(), mIllustrationLottie);

        }

        mIllustrationAccessibility = findViewById(R.id.illustration_accessibility);



        mIsUsingLottie = getResources().getBoolean(R.bool.config_face_education_use_lottie);