PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Remove subtext when enrollment stage changes" into tm-qpr-dev

Browse Source
This commit is contained in:
Diya Bera
2023-03-10 21:11:09 +00:00
committed by Android (Google) Code Review
parent f7a098295f 8ceded494f
commit 9777ea2fdf
2 changed files with 26 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/com/android/settings/biometrics/fingerprint/FingerprintEnrollEnrolling.java
View File

@@ -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
tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollEnrollingTest.java
View File

@@ -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);
}