Merge "Revert "Fix the flicker of FingerprintSettings before FingerprintEnrollIntro.""
This commit is contained in:
committed by
Android (Google) Code Review
commit
b79c8c6eb4
@@ -179,20 +179,8 @@ public class FingerprintStatusUtilsTest {
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
public void getSettingsClassName_whenNotEnrolled_fingerprintOnly_returnsFingerprintEnrollInduction() {
|
public void getSettingsClassName_whenNotEnrolled_returnsFingerprintSettings() {
|
||||||
when(mFingerprintManager.hasEnrolledFingerprints(anyInt())).thenReturn(false);
|
when(mFingerprintManager.hasEnrolledFingerprints(anyInt())).thenReturn(false);
|
||||||
when(mFingerprintManager.isHardwareDetected()).thenReturn(true);
|
|
||||||
when(mFaceManager.isHardwareDetected()).thenReturn(false);
|
|
||||||
|
|
||||||
assertThat(mFingerprintStatusUtils.getSettingsClassName())
|
|
||||||
.isEqualTo(FingerprintEnrollIntroductionInternal.class.getName());
|
|
||||||
}
|
|
||||||
|
|
||||||
@Test
|
|
||||||
public void getSettingsClassName_whenNotEnrolled_fingerprintNotOnly_returnsFingerprintSettings() {
|
|
||||||
when(mFingerprintManager.hasEnrolledFingerprints(anyInt())).thenReturn(false);
|
|
||||||
when(mFingerprintManager.isHardwareDetected()).thenReturn(true);
|
|
||||||
when(mFaceManager.isHardwareDetected()).thenReturn(true);
|
|
||||||
|
|
||||||
assertThat(mFingerprintStatusUtils.getSettingsClassName())
|
assertThat(mFingerprintStatusUtils.getSettingsClassName())
|
||||||
.isEqualTo(FingerprintSettings.class.getName());
|
.isEqualTo(FingerprintSettings.class.getName());
|
||||||
|
Reference in New Issue
Block a user