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

Commit 3a4c6feb authored by Diya Bera's avatar Diya Bera Committed by Automerger Merge Worker
Browse files

Merge "Remove subtext when enrollment stage changes" into tm-qpr-dev am: 9777ea2f am: 9a93c8a0 

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21911480



Change-Id: I27b79bf6dcc69e42ea3af7f5b1274173676996fa
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 76452f3a 9a93c8a0

src/com/android/settings/biometrics/fingerprint/FingerprintEnrollEnrolling.java

+4 −1
Original line number Diff line number Diff line
@@ -769,7 +769,10 @@ public class FingerprintEnrollEnrolling extends BiometricsEnrollEnrolling { 
        }

    }



    private void configureEnrollmentStage(@RawRes int lottie) {

    @VisibleForTesting void configureEnrollmentStage(@RawRes int lottie) {

        if (!mCanAssumeSfps) {

            setDescriptionText("");

        }

        LottieCompositionFactory.fromRawRes(this, lottie)

                .addListener((c) -> {

                    mIllustrationLottie.setComposition(c);

tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollEnrollingTest.java

+22 −0
Original line number Diff line number Diff line
@@ -452,6 +452,28 @@ public class FingerprintEnrollEnrollingTest { 
        assertThat(getLayout().getDescriptionTextView().getVisibility()).isEqualTo(View.VISIBLE);

    }



    @Test

    public void testUdfpsConfigureEnrollmentStage_descriptionText() {

        initializeActivityFor(TYPE_UDFPS_OPTICAL);



        assertThat(getLayout().getDescriptionText()).isNotEqualTo("");



        mActivity.configureEnrollmentStage(0 /* lottie */);



        assertThat(getLayout().getDescriptionText()).isEqualTo("");

    }



    @Test

    public void testSfpsConfigureEnrollmentStage_descriptionText() {

        initializeActivityFor(TYPE_POWER_BUTTON);



        assertThat(getLayout().getDescriptionTextView().getVisibility()).isEqualTo(View.GONE);



        mActivity.configureEnrollmentStage(0 /* lottie */);



        assertThat(getLayout().getDescriptionTextView().getVisibility()).isEqualTo(View.GONE);

    }



    private GlifLayout getLayout() {

        return (GlifLayout) mActivity.findViewById(R.id.setup_wizard_layout);

    }