From 8ceded494f56f8290cc7fa0e50cfbaf7e65b1fc0 Mon Sep 17 00:00:00 2001 From: Diya Bera Date: Wed, 8 Mar 2023 18:55:52 +0000 Subject: [PATCH] Remove subtext when enrollment stage changes Bug: 272145668 Test: Manual (Try enrolling fingerprint in UDFPS, the subtext should disappear when lottie asset is introduced) Change-Id: I912ff2b32644d05cc189105ae1679fa14b04a1ef --- .../FingerprintEnrollEnrolling.java | 5 ++++- .../FingerprintEnrollEnrollingTest.java | 22 +++++++++++++++++++ 2 files changed, 26 insertions(+), 1 deletion(-) diff --git a/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollEnrolling.java b/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollEnrolling.java index 9ed284cee61..368564a01fa 100644 --- a/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollEnrolling.java +++ b/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollEnrolling.java @@ -676,7 +676,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 439abc6f61d..ea479247a51 100644 --- a/tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollEnrollingTest.java +++ b/tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollEnrollingTest.java @@ -283,6 +283,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); }