diff options
5 files changed, 5 insertions, 13 deletions
diff --git a/packages/SystemUI/res/layout/biometric_prompt_one_pane_layout.xml b/packages/SystemUI/res/layout/biometric_prompt_one_pane_layout.xml index 4002f7808637..43808f215a81 100644 --- a/packages/SystemUI/res/layout/biometric_prompt_one_pane_layout.xml +++ b/packages/SystemUI/res/layout/biometric_prompt_one_pane_layout.xml @@ -21,9 +21,6 @@ style="@style/AuthCredentialPanelStyle" android:layout_width="0dp" android:layout_height="0dp" - android:accessibilityLiveRegion="assertive" - android:importantForAccessibility="yes" - android:clickable="false" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toStartOf="@id/rightGuideline" app:layout_constraintStart_toStartOf="@id/leftGuideline" diff --git a/packages/SystemUI/res/layout/biometric_prompt_two_pane_layout.xml b/packages/SystemUI/res/layout/biometric_prompt_two_pane_layout.xml index 3c8cb6860a41..51117a7845df 100644 --- a/packages/SystemUI/res/layout/biometric_prompt_two_pane_layout.xml +++ b/packages/SystemUI/res/layout/biometric_prompt_two_pane_layout.xml @@ -22,9 +22,6 @@ android:layout_height="match_parent"> style="@style/AuthCredentialPanelStyle" android:layout_width="0dp" android:layout_height="0dp" - android:accessibilityLiveRegion="assertive" - android:importantForAccessibility="yes" - android:clickable="false" android:paddingHorizontal="16dp" android:paddingVertical="16dp" android:visibility="visible" 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 { diff --git a/packages/SystemUI/tests/src/com/android/systemui/biometrics/ui/viewmodel/PromptViewModelTest.kt b/packages/SystemUI/tests/src/com/android/systemui/biometrics/ui/viewmodel/PromptViewModelTest.kt index bf79d11b2fb8..2c70249bcb06 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/biometrics/ui/viewmodel/PromptViewModelTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/biometrics/ui/viewmodel/PromptViewModelTest.kt @@ -1472,7 +1472,7 @@ internal class PromptViewModelTest(private val testCase: TestCase) : SysuiTestCa whenever(kosmos.udfpsUtils.onTouchOutsideOfSensorArea(any(), any(), any(), any(), any())) .thenReturn("Direction") - kosmos.promptViewModel.onUpdateAccessibilityHint( + kosmos.promptViewModel.onAnnounceAccessibilityHint( obtainMotionEvent(MotionEvent.ACTION_HOVER_ENTER), true, ) @@ -1497,7 +1497,7 @@ internal class PromptViewModelTest(private val testCase: TestCase) : SysuiTestCa whenever(kosmos.udfpsUtils.onTouchOutsideOfSensorArea(any(), any(), any(), any(), any())) .thenReturn("Direction") - kosmos.promptViewModel.onUpdateAccessibilityHint( + kosmos.promptViewModel.onAnnounceAccessibilityHint( obtainMotionEvent(MotionEvent.ACTION_HOVER_ENTER), true, ) |