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 am: 9777ea2fdf am: 9a93c8a00f

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21911480

Change-Id: I27b79bf6dcc69e42ea3af7f5b1274173676996fa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Diya Bera
2023-03-11 01:14:57 +00:00
committed by Automerger Merge Worker
parent 76452f3a1f 9a93c8a00f
commit 3a4c6feb0a
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);
}