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

Commit 5dfd19a2 authored by Jim Miller's avatar Jim Miller Committed by The Android Automerger
Browse files

Revert "Auto advance fingerprint enrollment when user taps on the sensor" 

This reverts commit b3253f1d.

Fixes bug 25694018

Change-Id: I29c78e6669db79ff996a1ecdf1cf45cff9ecef69
parent 4ef99cbf

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

+1 −1
Original line number Diff line number Diff line
@@ -50,7 +50,7 @@ import com.android.settings.R; 
public class FingerprintEnrollEnrolling extends FingerprintEnrollBase

        implements FingerprintEnrollSidecar.Listener {



    static final String TAG_SIDECAR = "sidecar";

    private static final String TAG_SIDECAR = "sidecar";



    private static final int PROGRESS_BAR_MAX = 10000;

    private static final int FINISH_DELAY = 250;

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

+1 −27
Original line number Diff line number Diff line
@@ -23,12 +23,11 @@ import android.os.Bundle; 
import com.android.internal.logging.MetricsLogger;

import com.android.settings.ChooseLockSettingsHelper;

import com.android.settings.R;

import com.android.settings.fingerprint.FingerprintEnrollSidecar.Listener;



/**

 * Activity explaining the fingerprint sensor location for fingerprint enrollment.

 */

public class FingerprintEnrollFindSensor extends FingerprintEnrollBase implements Listener {

public class FingerprintEnrollFindSensor extends FingerprintEnrollBase {



    private static final int CONFIRM_REQUEST = 1;

    private static final int ENROLLING = 2;
@@ -36,7 +35,6 @@ public class FingerprintEnrollFindSensor extends FingerprintEnrollBase implement 


    private FingerprintLocationAnimationView mAnimation;

    private boolean mLaunchedConfirmLock;

    private FingerprintEnrollSidecar mSidecar;



    @Override

    protected void onCreate(Bundle savedInstanceState) {
@@ -56,14 +54,6 @@ public class FingerprintEnrollFindSensor extends FingerprintEnrollBase implement 
    protected void onStart() {

        super.onStart();

        mAnimation.startAnimation();

        mSidecar = (FingerprintEnrollSidecar) getFragmentManager().findFragmentByTag(

                FingerprintEnrollEnrolling.TAG_SIDECAR);

        if (mSidecar == null) {

            mSidecar = new FingerprintEnrollSidecar();

            getFragmentManager().beginTransaction()

                    .add(mSidecar, FingerprintEnrollEnrolling.TAG_SIDECAR).commit();

        }

        mSidecar.setListener(this);

    }



    @Override
@@ -135,20 +125,4 @@ public class FingerprintEnrollFindSensor extends FingerprintEnrollBase implement 
    protected int getMetricsCategory() {

        return MetricsLogger.FINGERPRINT_FIND_SENSOR;

    }



    @Override

    public void onEnrollmentHelp(CharSequence helpString) {

    }



    @Override

    public void onEnrollmentError(int errMsgId, CharSequence errString) {

    }



    @Override

    public void onEnrollmentProgressChange(int steps, int remaining) {

        // Activity on the sensor should auto-advance to the enrolling step

        mSidecar.setListener(null);

        getFragmentManager().beginTransaction().remove(mSidecar).commit();

        onNextButtonClick();

    }

}