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

Commit cb38ac25 authored by Kevin Chyn's avatar Kevin Chyn Committed by Android (Google) Code Review
Browse files

Merge "Revert "Corrected flow for accessibility."" into qt-dev

parents 987c97c5 0c37f273

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

+1 −12
Original line number Diff line number Diff line
@@ -30,7 +30,6 @@ import android.os.UserHandle; 
import android.provider.Settings;

import android.text.TextUtils;

import android.view.View;

import android.view.accessibility.AccessibilityManager;

import android.widget.Button;

import android.widget.CompoundButton;
@@ -99,16 +98,6 @@ public class FaceEnrollEducation extends BiometricEnrollBase { 
                        .build()

        );



        boolean accessibilityEnabled = false;

        final AccessibilityManager accessibilityManager = getApplicationContext().getSystemService(

                AccessibilityManager.class);

        if (accessibilityManager != null) {

            accessibilityEnabled = accessibilityManager.isEnabled();

            if (accessibilityEnabled) {

                accessibilityButton.callOnClick();

            }

        }



        final FooterButton footerButton = new FooterButton.Builder(this)

                .setText(R.string.wizard_next)

                .setListener(this::onNextButtonClick)
@@ -120,7 +109,7 @@ public class FaceEnrollEducation extends BiometricEnrollBase { 
        final Context context = getApplicationContext();

        final boolean didDisplayEdu = Settings.Secure.getIntForUser(context.getContentResolver(),

                FACE_UNLOCK_EDUCATION_INFO_DISPLAYED, OFF, mUserId) == ON;

        if (!didDisplayEdu && !accessibilityEnabled) {

        if (!didDisplayEdu) {

            Settings.Secure.putIntForUser(context.getContentResolver(),

                    FACE_UNLOCK_EDUCATION_INFO_DISPLAYED, ON, mUserId);

            footerButton.setEnabled(false);