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

Commit 33ba2451 authored by Kevin Chyn's avatar Kevin Chyn
Browse files

Cancel enrollment when back or negative buttons pressed 

Fixes: 183671394
Test: Go through enrollment flow and test various buttons
Change-Id: I8d3939de42ecd0a889f0c6d3c94002199285ef8b
parent 501eea7f

src/com/android/settings/biometrics/BiometricsEnrollEnrolling.java

+11 −6
Original line number Diff line number Diff line
@@ -89,6 +89,17 @@ public abstract class BiometricsEnrollEnrolling extends BiometricEnrollBase 


    @Override

    public void onBackPressed() {

        cancelEnrollment();

        super.onBackPressed();

    }



    protected void onSkipButtonClick(View view) {

        cancelEnrollment();

        setResult(RESULT_SKIP);

        finish();

    }



    public void cancelEnrollment() {

        if (mSidecar != null) {

            mSidecar.setListener(null);

            mSidecar.cancelEnrollment();
@@ -96,12 +107,6 @@ public abstract class BiometricsEnrollEnrolling extends BiometricEnrollBase 
                    .beginTransaction().remove(mSidecar).commitAllowingStateLoss();

            mSidecar = null;

        }

        super.onBackPressed();

    }



    protected void onSkipButtonClick(View view) {

        setResult(RESULT_SKIP);

        finish();

    }



    public void startEnrollment() {

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

+17 −0
Original line number Diff line number Diff line
@@ -111,6 +111,12 @@ public class FingerprintEnrollFindSensor extends BiometricEnrollBase implements 
        }

    }



    @Override

    public void onBackPressed() {

        stopLookingForFingerprint();

        super.onBackPressed();

    }



    protected int getContentView() {

        if (mCanAssumeUdfps) {

            if (BiometricUtils.isReverseLandscape(getApplicationContext())) {
@@ -130,6 +136,16 @@ public class FingerprintEnrollFindSensor extends BiometricEnrollBase implements 
        }

    }



    private void stopLookingForFingerprint() {

        if (mSidecar != null) {

            mSidecar.setListener(null);

            mSidecar.cancelEnrollment();

            getSupportFragmentManager()

                    .beginTransaction().remove(mSidecar).commitAllowingStateLoss();

            mSidecar = null;

        }

    }



    private void startLookingForFingerprint() {

        mSidecar = (FingerprintEnrollSidecar) getSupportFragmentManager().findFragmentByTag(

                FingerprintEnrollEnrolling.TAG_SIDECAR);
@@ -185,6 +201,7 @@ public class FingerprintEnrollFindSensor extends BiometricEnrollBase implements 
    }



    protected void onSkipButtonClick(View view) {

        stopLookingForFingerprint();

        setResult(RESULT_SKIP);

        finish();

    }