Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cfa6ede1 authored by Grace Cheng's avatar Grace Cheng Committed by Android Build Coastguard Worker
Browse files

Revert "Replace UDFPS BiometricPrompt a11y announcements with live region" 

This reverts commit f022b03c.

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
parent 87b1245e

packages/SystemUI/res/layout/biometric_prompt_one_pane_layout.xml

+0 −3
Original line number Diff line number Diff line
@@ -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"

packages/SystemUI/res/layout/biometric_prompt_two_pane_layout.xml

+0 −3
Original line number Diff line number Diff line
@@ -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"

packages/SystemUI/src/com/android/systemui/biometrics/ui/binder/BiometricViewBinder.kt

+2 −4
Original line number Diff line number Diff line
@@ -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)

                    }

                }

packages/SystemUI/src/com/android/systemui/biometrics/ui/viewmodel/PromptViewModel.kt

+1 −1
Original line number Diff line number Diff line
@@ -886,7 +886,7 @@ constructor( 
    }



    /** Sets the message used for UDFPS directional guidance */

    suspend fun onUpdateAccessibilityHint(

    suspend fun onAnnounceAccessibilityHint(

        event: MotionEvent,

        touchExplorationEnabled: Boolean,

    ): Boolean {

packages/SystemUI/tests/src/com/android/systemui/biometrics/ui/viewmodel/PromptViewModelTest.kt

+2 −2
Original line number Diff line number Diff line
@@ -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,

        )