From: joshmccloskey <joshmccloskey@google.com>
Date: Mon, 13 May 2019 21:25:37 +0000 (-0700)
Subject: Corrected flow for accessibility.
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=b9cb83e4c6aec226762dd48ed561712d4b935e7e;p=android-x86%2Fpackages-apps-Settings.git

Corrected flow for accessibility.

Fixes: 132635400
Test: Manual.
Change-Id: Ied01b76d273b35e01f83a0a744ca2768d02380c5
---

diff --git a/src/com/android/settings/biometrics/face/FaceEnrollEducation.java b/src/com/android/settings/biometrics/face/FaceEnrollEducation.java
index 6e162dcb8b..a841d7ebd4 100644
--- a/src/com/android/settings/biometrics/face/FaceEnrollEducation.java
+++ b/src/com/android/settings/biometrics/face/FaceEnrollEducation.java
@@ -30,6 +30,7 @@ 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;
 
@@ -107,6 +108,16 @@ 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)
@@ -118,7 +129,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) {
+        if (!didDisplayEdu && !accessibilityEnabled) {
             Settings.Secure.putIntForUser(context.getContentResolver(),
                     FACE_UNLOCK_EDUCATION_INFO_DISPLAYED, ON, mUserId);
             footerButton.setEnabled(false);