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

Commit 88c9b00b authored by Joshua Mccloskey's avatar Joshua Mccloskey Committed by Automerger Merge Worker
Browse files

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

Merge "Revert "Fix the flicker of FingerprintSettings before FingerprintEnrollIntro."" into tm-qpr-dev am: 1dd3fefa

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



Change-Id: Ic81bafc8063bba1e65eef7729001556e8a330247
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 2a557b75 1dd3fefa

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

+1 −3
Original line number Diff line number Diff line
@@ -78,9 +78,7 @@ public class FingerprintStatusUtils { 
     * Returns the class name of the Settings page corresponding to fingerprint settings.

     */

    public String getSettingsClassName() {

        return !hasEnrolled() && isAvailable()

            ? FingerprintEnrollIntroductionInternal.class.getName()

            : FingerprintSettings.class.getName();

        return FingerprintSettings.class.getName();

    }



    /**

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

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



    @Test

    public void getSettingsClassName_whenNotEnrolled_fingerprintOnly_returnsFingerprintEnrollInduction() {

    public void getSettingsClassName_whenNotEnrolled_returnsFingerprintSettings() {

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