commit fae319353942c50a7241b8517de154e4f6b01fdd
author joshmccloskey <joshmccloskey@google.com> Mon Jul 22 17:10:55 2019 -0700
committer Joshua Mccloskey <joshmccloskey@google.com> Tue Jul 23 19:13:08 2019 +0000
tree e76b0e70f1c46145374b9894c9af3129a4930762
parent 6e57d54d358c2a2443ef09c738ee0c7254269b1e

Add extra check for accessibility flow.

Bug: 138197084
Test: Verified other accessibility features like Live Transcribe does
not bring the user to the accessibility flow.
Test: Verified that the Sound Amplifier does not bring the user to
the accessibility flow.

Change-Id: I5131d74926c0b01c565da280c55afe0080855688

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

diff --git a/src/com/android/settings/biometrics/face/FaceEnrollEducation.java b/src/com/android/settings/biometrics/face/FaceEnrollEducation.java
index 99d96dd..011cc12 100644
--- a/src/com/android/settings/biometrics/face/FaceEnrollEducation.java
+++ b/src/com/android/settings/biometrics/face/FaceEnrollEducation.java
@@ -134,7 +134,10 @@
         final AccessibilityManager accessibilityManager = getApplicationContext().getSystemService(
                 AccessibilityManager.class);
         if (accessibilityManager != null) {
-            accessibilityEnabled = accessibilityManager.isEnabled();
+            // Add additional check for touch exploration. This prevents other accessibility
+            // features such as Live Transcribe from defaulting to the accessibility setup.
+            accessibilityEnabled = accessibilityManager.isEnabled()
+                    && accessibilityManager.isTouchExplorationEnabled();
         }
         mFooterBarMixin.setPrimaryButton(footerButton);
         final Context context = getApplicationContext();