Merge "Fix the flicker of FingerprintSettings before FingerprintEnrollIntro." into tm-qpr-dev (8a0074e9) · Commits · e / os / android_packages_apps_Settings

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

+3 −1

Original line number	Diff line number	Diff line
		@@ -78,7 +78,9 @@ public class FingerprintStatusUtils {
		* Returns the class name of the Settings page corresponding to fingerprint settings.
		*/
		public String getSettingsClassName() {
		return FingerprintSettings.class.getName();
		return !hasEnrolled() && isAvailable()
		? FingerprintEnrollIntroductionInternal.class.getName()
		: FingerprintSettings.class.getName();
		}

		/**

+13 −1

Original line number	Diff line number	Diff line
		@@ -179,8 +179,20 @@ public class FingerprintStatusUtilsTest {
		}

		@Test
		public void getSettingsClassName_whenNotEnrolled_returnsFingerprintSettings() {
		public void getSettingsClassName_whenNotEnrolled_fingerprintOnly_returnsFingerprintEnrollInduction() {
		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())
		.isEqualTo(FingerprintSettings.class.getName());