From e200dceb61ea76239c2dc557a53517fea6ea987b Mon Sep 17 00:00:00 2001 From: Joe Bolinger Date: Thu, 16 Dec 2021 01:24:55 +0000 Subject: [PATCH] Do not select hint indicator when talkback is enabled. This prevents "Selected" from being announced but prevents the text from scrolling (not as important when talkback is enabled). Fix: 210363098 Test: manual (use biometric prompt with talkback on/off and verify text only scrolls when off) Change-Id: I7d77cd871d8d8e817f418aea0c6ce9c5153a5b60 --- .../com/android/systemui/biometrics/AuthBiometricView.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/packages/SystemUI/src/com/android/systemui/biometrics/AuthBiometricView.java b/packages/SystemUI/src/com/android/systemui/biometrics/AuthBiometricView.java index e35b55841f2ff..1496f170dffee 100644 --- a/packages/SystemUI/src/com/android/systemui/biometrics/AuthBiometricView.java +++ b/packages/SystemUI/src/com/android/systemui/biometrics/AuthBiometricView.java @@ -636,7 +636,9 @@ public abstract class AuthBiometricView extends LinearLayout { mIndicatorView.setText(message); mIndicatorView.setTextColor(mTextColorError); mIndicatorView.setVisibility(View.VISIBLE); - mIndicatorView.setSelected(true); + // select to enable marquee unless a screen reader is enabled + mIndicatorView.setSelected(!mAccessibilityManager.isEnabled() + || !mAccessibilityManager.isTouchExplorationEnabled()); mHandler.postDelayed(resetMessageRunnable, mInjector.getDelayAfterError()); Utils.notifyAccessibilityContentChanged(mAccessibilityManager, this);