summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author TreeHugger Robot <treehugger-gerrit@google.com> 2021-12-16 22:48:06 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2021-12-16 22:48:06 +0000
commit0fd1959c4490a2290aa74e39a666b6ef607d1303 (patch)
tree42915a05eef1ff20c25e24ad69962c9cf5e368b4
parent4413f9d635792aebb35c58284eac89ba79b3b184 (diff)
parent83f38a1b994d536287443e2ad36300148b3ed320 (diff)
Merge "Do not select hint indicator when talkback is enabled." into sc-v2-dev am: 83f38a1b99
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16484536 Change-Id: I29531957fbb0ff8a895fc8c58f02c95bfae2fb86
-rw-r--r--packages/SystemUI/src/com/android/systemui/biometrics/AuthBiometricView.java4
1 files changed, 3 insertions, 1 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/biometrics/AuthBiometricView.java b/packages/SystemUI/src/com/android/systemui/biometrics/AuthBiometricView.java
index e35b55841f2f..1496f170dffe 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);