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

Commit 561a68db authored by Milton Wu's avatar Milton Wu
Browse files

Use setting as base activity for fingerprint 

Change to use FingerprintSetting as base activity when use launch
"Fingerprint Unlock" from Settings -> Security. And then we can prevent
that necesssary pop-up activites become full-screen.

Bug: 243701933
Bug: 232874879

Test: manual test following cases on fp-only devices, and enable don't
      keep activity and test them again.
      1. fp enrollment on SUW
      2. fp add another on SUW
      3. add first fp on Security Settings
      4. add another fp on Security Settings
Test: atest FingerprintStatusUtilsTest BiometricsSafetySourceTest
Test: robo test for SetupFingerprintEnrollFindSensorTest
      SetupFingerprintEnrollFinishTest
      FingerprintEnrollFindSensorTest FingerprintEnrollEnrollingTest

Merged-In: Ib1c2ef9f93fb910eed2930f871c0c69bdb94bcbd
Change-Id: Ib1c2ef9f93fb910eed2930f871c0c69bdb94bcbd
(cherry picked from commit 84b39c3e)
parent e167286a

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

+1 −15
Original line number Diff line number Diff line
@@ -24,8 +24,6 @@ import android.view.View; 
import com.android.settings.R;

import com.android.settings.password.ChooseLockSettingsHelper;



import com.google.android.setupcompat.util.WizardManagerHelper;



/**

 * Abstract base activity which handles the actual enrolling for biometrics.

 */
@@ -62,30 +60,18 @@ public abstract class BiometricsEnrollEnrolling extends BiometricEnrollBase 


    @Override

    protected void onStop() {

        super.onStop();



        if (mSidecar != null) {

            mSidecar.setListener(null);

        }



        if (!isChangingConfigurations()) {

            if (mSidecar != null) {

                mSidecar.cancelEnrollment();

                getSupportFragmentManager()

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

            }

            if (!WizardManagerHelper.isAnySetupWizard(getIntent())

                    && !BiometricUtils.isAnyMultiBiometricFlow(this)) {

                setResult(RESULT_TIMEOUT);

            }

            finish();

        }

        }



    @Override

    protected boolean shouldFinishWhenBackgrounded() {

        // Prevent super.onStop() from finishing, since we handle this in our onStop().

        return false;

        super.onStop();

    }



    @Override

src/com/android/settings/biometrics/face/FaceEnrollEnrolling.java

+21 −0
Original line number Diff line number Diff line
@@ -31,11 +31,13 @@ import com.android.settings.R; 
import com.android.settings.biometrics.BiometricEnrollBase;

import com.android.settings.biometrics.BiometricEnrollSidecar;

import com.android.settings.biometrics.BiometricErrorDialog;

import com.android.settings.biometrics.BiometricUtils;

import com.android.settings.biometrics.BiometricsEnrollEnrolling;

import com.android.settings.slices.CustomSliceRegistry;



import com.google.android.setupcompat.template.FooterBarMixin;

import com.google.android.setupcompat.template.FooterButton;

import com.google.android.setupcompat.util.WizardManagerHelper;



import java.util.ArrayList;
@@ -112,6 +114,25 @@ public class FaceEnrollEnrolling extends BiometricsEnrollEnrolling { 
        startEnrollment();

    }



    @Override

    protected void onStop() {

        if (!isChangingConfigurations()) {

            if (!WizardManagerHelper.isAnySetupWizard(getIntent())

                    && !BiometricUtils.isAnyMultiBiometricFlow(this)) {

                setResult(RESULT_TIMEOUT);

            }

            finish();

        }



        super.onStop();

    }



    @Override

    protected boolean shouldFinishWhenBackgrounded() {

        // Prevent super.onStop() from finishing, since we handle this in our onStop().

        return false;

    }



    @Override

    public void startEnrollment() {

        super.startEnrollment();

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

+16 −1
Original line number Diff line number Diff line
@@ -339,8 +339,23 @@ public class FingerprintEnrollEnrolling extends BiometricsEnrollEnrolling { 


    @Override

    protected void onStop() {

        super.onStop();

        if (!isChangingConfigurations()) {

            if (!WizardManagerHelper.isAnySetupWizard(getIntent())

                    && !BiometricUtils.isAnyMultiBiometricFlow(this)

                    && !mFromSettingsSummary) {

                setResult(RESULT_TIMEOUT);

            }

            finish();

        }

        stopIconAnimation();



        super.onStop();

    }



    @Override

    protected boolean shouldFinishWhenBackgrounded() {

        // Prevent super.onStop() from finishing, since we handle this in our onStop().

        return false;

    }



    @Override

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

+11 −2
Original line number Diff line number Diff line
@@ -49,8 +49,8 @@ import java.util.List; 
public class FingerprintEnrollFindSensor extends BiometricEnrollBase implements

        BiometricEnrollSidecar.Listener {





    private static final String TAG = "FingerprintEnrollFindSensor";

    private static final String SAVED_STATE_IS_NEXT_CLICKED = "is_next_clicked";



    @Nullable

    private FingerprintFindSensorAnimation mAnimation;
@@ -174,6 +174,15 @@ public class FingerprintEnrollFindSensor extends BiometricEnrollBase implements 
                mAnimation = (FingerprintFindSensorAnimation) animationView;

            }

        }

        if (savedInstanceState != null) {

            mNextClicked = savedInstanceState.getBoolean(SAVED_STATE_IS_NEXT_CLICKED, mNextClicked);

        }

    }



    @Override

    protected void onSaveInstanceState(Bundle outState) {

        super.onSaveInstanceState(outState);

        outState.putBoolean(SAVED_STATE_IS_NEXT_CLICKED, mNextClicked);

    }



    @Override
@@ -240,7 +249,6 @@ public class FingerprintEnrollFindSensor extends BiometricEnrollBase implements 
    @Override

    public void onEnrollmentError(int errMsgId, CharSequence errString) {

        if (mNextClicked && errMsgId == FingerprintManager.FINGERPRINT_ERROR_CANCELED) {

            mNextClicked = false;

            proceedToEnrolling(false /* cancelEnrollment */);

        } else {

            FingerprintErrorDialog.showErrorDialog(this, errMsgId);
@@ -341,6 +349,7 @@ public class FingerprintEnrollFindSensor extends BiometricEnrollBase implements 
                        finish();

                    } else {

                        // We came back from enrolling but it wasn't completed, start again.

                        mNextClicked = false;

                        startLookingForFingerprint();

                    }

                    break;

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

+5 −15
Original line number Diff line number Diff line
@@ -32,7 +32,6 @@ import com.android.settings.R; 
import com.android.settings.Utils;

import com.android.settings.biometrics.BiometricEnrollBase;

import com.android.settings.biometrics.BiometricUtils;

import com.android.settings.password.ChooseLockSettingsHelper;



import com.google.android.setupcompat.template.FooterBarMixin;

import com.google.android.setupcompat.template.FooterButton;
@@ -114,9 +113,6 @@ public class FingerprintEnrollFinish extends BiometricEnrollBase { 
        setResult(RESULT_FINISHED);

        if (WizardManagerHelper.isAnySetupWizard(getIntent())) {

            postEnroll();

        } else if (mFromSettingsSummary) {

            // Only launch fingerprint settings if enrollment was triggered through settings summary

            launchFingerprintSettings();

        }

        finish();

    }
@@ -148,21 +144,15 @@ public class FingerprintEnrollFinish extends BiometricEnrollBase { 
        }

    }



    private void launchFingerprintSettings() {

        final Intent intent = new Intent(ACTION_FINGERPRINT_SETTINGS);

        intent.setPackage(Utils.SETTINGS_PACKAGE_NAME);

        intent.putExtra(ChooseLockSettingsHelper.EXTRA_KEY_CHALLENGE_TOKEN, mToken);

        intent.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP | Intent.FLAG_ACTIVITY_SINGLE_TOP);

        intent.putExtra(Intent.EXTRA_USER_ID, mUserId);

        intent.putExtra(BiometricEnrollBase.EXTRA_KEY_CHALLENGE, mChallenge);

        startActivity(intent);

        overridePendingTransition(R.anim.sud_slide_back_in, R.anim.sud_slide_back_out);

    }



    private void onAddAnotherButtonClick(View view) {

        startActivityForResult(getFingerprintEnrollingIntent(), BiometricUtils.REQUEST_ADD_ANOTHER);

    }



    @Override

    protected boolean shouldFinishWhenBackgrounded() {

        return !isFinishing() && super.shouldFinishWhenBackgrounded();

    }



    @Override

    protected void onActivityResult(int requestCode, int resultCode, Intent data) {

        updateFingerprintSuggestionEnableState();