diff options
| author | 2025-04-01 18:43:08 -0700 | |
|---|---|---|
| committer | 2025-04-04 21:37:55 -0700 | |
| commit | cfa6ede1c3116cd3ac77470ec67569ecfc938340 (patch) | |
| tree | 8e5f5865f58a7185d8663158759ed57845702947 /packages/SystemUI/src | |
| parent | 87b1245ebaa38263e312a3937ac9916d2bbf2364 (diff) | |
Revert "Replace UDFPS BiometricPrompt a11y announcements with live region"
This reverts commit f022b03cf4d6b3272ce683f51ae40c742c7c5283.
Reason for revert: reverting to original accessibility state with announcements
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:43a88d99f359d6a1760272e91d528f7a48a2dd3b)
Merged-In: Ie835fa8a190603b5f3183ce030514b09ac25de3c
Change-Id: Ie835fa8a190603b5f3183ce030514b09ac25de3c
Diffstat (limited to 'packages/SystemUI/src')
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/biometrics/ui/binder/BiometricViewBinder.kt | 6 | ||||
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/biometrics/ui/viewmodel/PromptViewModel.kt | 2 |
2 files changed, 3 insertions, 5 deletions
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 3b22e13f29a2..54c52b533da4 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 @@ -397,7 +397,7 @@ object BiometricViewBinder { // Talkback directional guidance udfpsGuidanceView.setOnHoverListener { _, event -> launch { - viewModel.onUpdateAccessibilityHint( + viewModel.onAnnounceAccessibilityHint( event, accessibilityManager.isTouchExplorationEnabled, ) @@ -406,9 +406,7 @@ object BiometricViewBinder { } launch { viewModel.accessibilityHint.collect { message -> - if (message.isNotBlank()) { - udfpsGuidanceView.contentDescription = message - } + if (message.isNotBlank()) view.announceForAccessibility(message) } } diff --git a/packages/SystemUI/src/com/android/systemui/biometrics/ui/viewmodel/PromptViewModel.kt b/packages/SystemUI/src/com/android/systemui/biometrics/ui/viewmodel/PromptViewModel.kt index 4e17a2658ee7..0902d19b6787 100644 --- a/packages/SystemUI/src/com/android/systemui/biometrics/ui/viewmodel/PromptViewModel.kt +++ b/packages/SystemUI/src/com/android/systemui/biometrics/ui/viewmodel/PromptViewModel.kt @@ -886,7 +886,7 @@ constructor( } /** Sets the message used for UDFPS directional guidance */ - suspend fun onUpdateAccessibilityHint( + suspend fun onAnnounceAccessibilityHint( event: MotionEvent, touchExplorationEnabled: Boolean, ): Boolean { |