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

Commit 60746517 authored by Ajay Nadathur's avatar Ajay Nadathur Committed by android-build-merger
Browse files

Merge "Remove extra steps in fingerprint flow" into oc-mr1-dev 

am: 57a92e5a

Change-Id: Ie06c454b68aa5cb82c3fcec9fbb39af72e38021b
parents 7cdb9438 57a92e5a

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

+1 −4
Original line number Diff line number Diff line
@@ -94,7 +94,7 @@ public class FingerprintEnrollEnrolling extends FingerprintEnrollBase 
    protected void onCreate(Bundle savedInstanceState) {

        super.onCreate(savedInstanceState);

        setContentView(R.layout.fingerprint_enroll_enrolling);

        setHeaderText(R.string.security_settings_fingerprint_enroll_start_title);

        setHeaderText(R.string.security_settings_fingerprint_enroll_repeat_title);

        mStartMessage = (TextView) findViewById(R.id.start_message);

        mRepeatMessage = (TextView) findViewById(R.id.repeat_message);

        mErrorText = (TextView) findViewById(R.id.error_text);
@@ -288,12 +288,9 @@ public class FingerprintEnrollEnrolling extends FingerprintEnrollBase 


    private void updateDescription() {

        if (mSidecar.getEnrollmentSteps() == -1) {

            setHeaderText(R.string.security_settings_fingerprint_enroll_start_title);

            mStartMessage.setVisibility(View.VISIBLE);

            mRepeatMessage.setVisibility(View.INVISIBLE);

        } else {

            setHeaderText(R.string.security_settings_fingerprint_enroll_repeat_title,

                    true /* force */);

            mStartMessage.setVisibility(View.INVISIBLE);

            mRepeatMessage.setVisibility(View.VISIBLE);

        }