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

Commit f19b9b6d authored by Selim Cinek's avatar Selim Cinek Committed by Android Git Automerger
Browse files

am 0fe43c9a: am fc76ddd0: am cda53c5d: Merge "Fixed a bug where the... 

am 0fe43c9a: am fc76ddd0: am cda53c5d: Merge "Fixed a bug where the ConfirmDeviceCredentials activity was shown twice." into mnc-dr-dev

* commit '0fe43c9a':
  Fixed a bug where the ConfirmDeviceCredentials activity was shown twice.
parents fb5aa541 0fe43c9a

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

+13 −2
Original line number Diff line number Diff line
@@ -16,7 +16,6 @@ 


package com.android.settings.fingerprint;



import android.content.Context;

import android.content.Intent;

import android.hardware.fingerprint.FingerprintManager;

import android.os.Bundle;
@@ -32,15 +31,19 @@ public class FingerprintEnrollFindSensor extends FingerprintEnrollBase { 


    private static final int CONFIRM_REQUEST = 1;

    private static final int ENROLLING = 2;

    public static final String EXTRA_KEY_LAUNCHED_CONFIRM = "launched_confirm_lock";



    private FingerprintLocationAnimationView mAnimation;

    private boolean mLaunchedConfirmLock;



    @Override

    protected void onCreate(Bundle savedInstanceState) {

        super.onCreate(savedInstanceState);

        setContentView(R.layout.fingerprint_enroll_find_sensor);

        setHeaderText(R.string.security_settings_fingerprint_enroll_find_sensor_title);

        if (mToken == null) {

        mLaunchedConfirmLock = savedInstanceState != null && savedInstanceState.getBoolean(

                EXTRA_KEY_LAUNCHED_CONFIRM);

        if (mToken == null && !mLaunchedConfirmLock) {

            launchConfirmLock();

        }

        mAnimation = (FingerprintLocationAnimationView) findViewById(
@@ -59,6 +62,12 @@ public class FingerprintEnrollFindSensor extends FingerprintEnrollBase { 
        mAnimation.stopAnimation();

    }



    @Override

    public void onSaveInstanceState(Bundle outState) {

        super.onSaveInstanceState(outState);

        outState.putBoolean(EXTRA_KEY_LAUNCHED_CONFIRM, mLaunchedConfirmLock);

    }



    @Override

    protected void onNextButtonClick() {

        startActivityForResult(getEnrollingIntent(), ENROLLING);
@@ -107,6 +116,8 @@ public class FingerprintEnrollFindSensor extends FingerprintEnrollBase { 
            // This shouldn't happen, as we should only end up at this step if a lock thingy is

            // already set.

            finish();

        } else {

            mLaunchedConfirmLock = true;

        }

    }