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

Commit 36c76014 authored by Maurice Lam's avatar Maurice Lam Committed by Android (Google) Code Review
Browse files

Merge "[Fingerprint] Show skip button during SUW" into mnc-dev

parents 5376d54e 5f8d7dbe

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

+6 −0
Original line number Diff line number Diff line
@@ -48,6 +48,12 @@ public class FingerprintEnrollBase extends Activity implements View.OnClickListe 
     */

    protected static final int RESULT_FINISHED = RESULT_FIRST_USER;



    /**

     * Used by the enrolling screen during setup wizard to skip over setting up fingerprint, which

     * will be useful if the user accidentally entered this flow.

     */

    protected static final int RESULT_SKIP = RESULT_FIRST_USER + 1;



    protected byte[] mToken;



    @Override

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

+3 −0
Original line number Diff line number Diff line
@@ -76,6 +76,9 @@ public class FingerprintEnrollFindSensor extends FingerprintEnrollBase { 
            if (resultCode == RESULT_FINISHED) {

                setResult(RESULT_FINISHED);

                finish();

            } else if (resultCode == RESULT_SKIP) {

                setResult(RESULT_SKIP);

                finish();

            } else {

                FingerprintManager fpm = getSystemService(FingerprintManager.class);

                int enrolled = fpm.getEnrolledFingerprints().size();

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

+4 −1
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
package com.android.settings.fingerprint;



import android.content.Context;

import android.content.Intent;

import android.hardware.fingerprint.Fingerprint;

import android.hardware.fingerprint.FingerprintManager;

import android.os.Bundle;
@@ -62,7 +63,9 @@ public class FingerprintEnrollFinish extends FingerprintEnrollBase { 
    @Override

    public void onClick(View v) {

        if (v.getId() == R.id.add_another_button) {

            startActivity(getEnrollingIntent());

            final Intent intent = getEnrollingIntent();

            intent.addFlags(Intent.FLAG_ACTIVITY_FORWARD_RESULT);

            startActivity(intent);

            finish();

        }

        super.onClick(v);

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

+3 −3
Original line number Diff line number Diff line
@@ -52,8 +52,7 @@ public class SetupFingerprintEnrollEnrolling extends FingerprintEnrollEnrolling 


        final NavigationBar navigationBar = getNavigationBar();

        navigationBar.setNavigationBarListener(this);

        // Enrolling screen auto-advances once the fingerprint is added

        navigationBar.getNextButton().setEnabled(false);

        navigationBar.getNextButton().setText(R.string.skip_label);

    }



    @Override
@@ -68,6 +67,7 @@ public class SetupFingerprintEnrollEnrolling extends FingerprintEnrollEnrolling 


    @Override

    public void onNavigateNext() {

        onNextButtonClick();

        setResult(RESULT_SKIP);

        finish();

    }

}