diff --git a/src/com/android/settings/biometrics/face/FaceEnrollEducation.java b/src/com/android/settings/biometrics/face/FaceEnrollEducation.java index c4aa2f3b78c..fae17852325 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; @@ -105,11 +106,17 @@ public class FaceEnrollEducation extends BiometricEnrollBase { .setTheme(R.style.SudGlifButton_Primary) .build(); + boolean accessibilityEnabled = false; + final AccessibilityManager accessibilityManager = getApplicationContext().getSystemService( + AccessibilityManager.class); + if (accessibilityManager != null) { + accessibilityEnabled = accessibilityManager.isEnabled(); + } mFooterBarMixin.setPrimaryButton(footerButton); 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); @@ -128,6 +135,10 @@ public class FaceEnrollEducation extends BiometricEnrollBase { mSwitchDiversity = findViewById(R.id.toggle_diversity); mSwitchDiversity.setListener(mSwitchDiversityListener); + + if (accessibilityEnabled) { + accessibilityButton.callOnClick(); + } } @Override