diff options
| author | Grace Cheng <graciecheng@google.com> | 2023-08-02 16:35:08 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2023-08-02 16:35:08 +0000 |
| commit | fad60a95fd086d4319f22313a65e3438fb80b6fe (patch) | |
| tree | ebd6f99e2c730203aa556879aaa6827364a42362 | |
| parent | 3a4572c91256fdb11aad53738843683709a21952 (diff) | |
| parent | b0b08a8f01ef9c7ae3d9d3d916eae28698f636e9 (diff) | |
| download | base-fad60a95fd086d4319f22313a65e3438fb80b6fe.tar.gz | |
Merge "Mark title & subtitle focusable, set selected unless a11y active" into udc-d1-dev
| -rw-r--r-- | packages/SystemUI/res/layout/biometric_prompt_layout.xml | 2 | ||||
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/biometrics/ui/binder/BiometricViewBinder.kt | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/packages/SystemUI/res/layout/biometric_prompt_layout.xml b/packages/SystemUI/res/layout/biometric_prompt_layout.xml index ecb0bfa35e9f..bea0e13c77dc 100644 --- a/packages/SystemUI/res/layout/biometric_prompt_layout.xml +++ b/packages/SystemUI/res/layout/biometric_prompt_layout.xml @@ -28,7 +28,6 @@ android:singleLine="true" android:marqueeRepeatLimit="1" android:ellipsize="marquee" - android:importantForAccessibility="no" style="@style/TextAppearance.AuthCredential.Title"/> <TextView @@ -39,7 +38,6 @@ android:singleLine="true" android:marqueeRepeatLimit="1" android:ellipsize="marquee" - android:importantForAccessibility="no" style="@style/TextAppearance.AuthCredential.Subtitle"/> <TextView diff --git a/packages/SystemUI/src/com/android/systemui/biometrics/ui/binder/BiometricViewBinder.kt b/packages/SystemUI/src/com/android/systemui/biometrics/ui/binder/BiometricViewBinder.kt index 105fd67d8e91..62475df0ac3f 100644 --- a/packages/SystemUI/src/com/android/systemui/biometrics/ui/binder/BiometricViewBinder.kt +++ b/packages/SystemUI/src/com/android/systemui/biometrics/ui/binder/BiometricViewBinder.kt @@ -93,9 +93,11 @@ object BiometricViewBinder { val subtitleView = view.findViewById<TextView>(R.id.subtitle) val descriptionView = view.findViewById<TextView>(R.id.description) - // set selected for marquee - titleView.isSelected = true - subtitleView.isSelected = true + // set selected to enable marquee unless a screen reader is enabled + titleView.isSelected = + !accessibilityManager.isEnabled || !accessibilityManager.isTouchExplorationEnabled + subtitleView.isSelected = + !accessibilityManager.isEnabled || !accessibilityManager.isTouchExplorationEnabled descriptionView.movementMethod = ScrollingMovementMethod() val iconViewOverlay = view.findViewById<LottieAnimationView>(R.id.biometric_icon_overlay) |