Merge "Add extra check for accessibility flow." into qt-r1-dev am: c563fbb979

am: 436155ba91

Change-Id: I4bdca0d0fe0cd5f38863eeb6975d026c424e6799
This commit is contained in:
Joshua Mccloskey
2019-07-23 22:14:08 -07:00
committed by android-build-merger

View File

@@ -134,7 +134,10 @@ public class FaceEnrollEducation extends BiometricEnrollBase {
final AccessibilityManager accessibilityManager = getApplicationContext().getSystemService( final AccessibilityManager accessibilityManager = getApplicationContext().getSystemService(
AccessibilityManager.class); AccessibilityManager.class);
if (accessibilityManager != null) { 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); mFooterBarMixin.setPrimaryButton(footerButton);
final Context context = getApplicationContext(); final Context context = getApplicationContext();