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

am: 07649a92ee

Change-Id: I830e470143a0779486ebf0f8e4b4eff86a3ea351

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

@@ -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);