Merge "Remove subtext when enrollment stage changes" into tm-qpr-dev (9777ea2f) · Commits · e / os / android_packages_apps_Settings

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

+4 −1

Original line number	Diff line number	Diff line
		@@ -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);

+22 −0

Original line number	Diff line number	Diff line
		@@ -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);
		}