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

Snap for 9730513 from 3a4c6feb0a to udc-release

Browse Source 
Change-Id: If2e78447f8222803adb8fc25c062d48fa51b9d9e
This commit is contained in:
Android Build Coastguard Worker
2023-03-12 03:32:57 +00:00
parent a81599c9a8 3a4c6feb0a
commit 17333a22f7
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

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

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

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