Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f5ffb13d authored by Hao Dong's avatar Hao Dong Committed by Automerger Merge Worker
Browse files

Merge "Fix the flicker of FingerprintSettings before FingerprintEnrollIntro."... 

Merge "Fix the flicker of FingerprintSettings before FingerprintEnrollIntro." into tm-qpr-dev am: 8a0074e9

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



Change-Id: Ibbc4c72d598d16b0bc99c36fb311d90bc1765912
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 486c74f4 8a0074e9

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

    }



    /**

tests/unit/src/com/android/settings/biometrics/fingerprint/FingerprintStatusUtilsTest.java

+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());