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

Commit 688fcb58 authored by Grace Cheng's avatar Grace Cheng Committed by Automerger Merge Worker
Browse files

Merge "Update SFPS Enrollment to have error messages replace title" into... 

Merge "Update SFPS Enrollment to have error messages replace title" into tm-qpr-dev am: e287bbe8 am: b0407932

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



Change-Id: I4dc805debfba57519840225456c8143fdf532232
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 7e9cc3d6 b0407932

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