diff --git a/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollEnrolling.java b/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollEnrolling.java index fcf4a60b0f2..9b1b30a782a 100644 --- a/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollEnrolling.java +++ b/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollEnrolling.java @@ -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); diff --git a/tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollEnrollingTest.java b/tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollEnrollingTest.java index 62230e2808b..2886194cff2 100644 --- a/tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollEnrollingTest.java +++ b/tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollEnrollingTest.java @@ -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); }