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

Commit dc82b636 authored by Grace Cheng's avatar Grace Cheng
Browse files

Update SFPS Enrollment to have error messages replace title 

Update SFPS Enrollment to have error messages replace title rather than showing error messages underneath the fingerprint animation

Fixes: 234135107
Test: Enroll finger and see error messages replace title
Change-Id: I106a0147bf69d8dfab99d58e9e309cfb32c650fa
parent 51d087cd

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

+4 −2
Original line number Diff line number Diff line
@@ -115,6 +115,7 @@ public class FingerprintEnrollEnrolling extends BiometricsEnrollEnrolling { 


    private FingerprintManager mFingerprintManager;

    private boolean mCanAssumeUdfps;

    private boolean mCanAssumeSidefps;

    @Nullable private ProgressBar mProgressBar;

    private ObjectAnimator mProgressAnim;

    private TextView mDescriptionText;
@@ -156,7 +157,8 @@ public class FingerprintEnrollEnrolling extends BiometricsEnrollEnrolling { 
        mFingerprintManager = getSystemService(FingerprintManager.class);

        final List<FingerprintSensorPropertiesInternal> props =

                mFingerprintManager.getSensorPropertiesInternal();

        mCanAssumeUdfps = props.size() == 1 && props.get(0).isAnyUdfpsType();

        mCanAssumeUdfps = props != null && props.size() == 1 && props.get(0).isAnyUdfpsType();

        mCanAssumeSidefps = props != null && props.size() == 1 && props.get(0).isAnySidefpsType();



        mAccessibilityManager = getSystemService(AccessibilityManager.class);

        mIsAccessibilityEnabled = mAccessibilityManager.isEnabled();
@@ -567,7 +569,7 @@ public class FingerprintEnrollEnrolling extends BiometricsEnrollEnrolling { 
    }



    private void showError(CharSequence error) {

        if (mCanAssumeUdfps) {

        if (mCanAssumeUdfps || mCanAssumeSidefps) {

            setHeaderText(error);

            // Show nothing for subtitle when getting an error message.

            setDescriptionText("");