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

Commit 77c8c18e authored by Hao Dong's avatar Hao Dong Committed by Android (Google) Code Review
Browse files

Merge "Announce error/help message for a11y instead of icon." into main

parents 8b7af664 6d699621

packages/SystemUI/res/layout-land/biometric_prompt_constraint_layout.xml

+1 −1
Original line number Diff line number Diff line
@@ -174,7 +174,7 @@ android:layout_height="match_parent"> 
        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:layout_marginTop="24dp"

        android:accessibilityLiveRegion="polite"

        android:accessibilityLiveRegion="assertive"

        android:fadingEdge="horizontal"

        android:gravity="center_horizontal"

        android:scrollHorizontally="true"

packages/SystemUI/res/layout-sw600dp/biometric_prompt_constraint_layout.xml

+1 −1
Original line number Diff line number Diff line
@@ -152,7 +152,7 @@ 
        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:layout_marginTop="24dp"

        android:accessibilityLiveRegion="polite"

        android:accessibilityLiveRegion="assertive"

        android:fadingEdge="horizontal"

        android:gravity="center_horizontal"

        android:scrollHorizontally="true"

packages/SystemUI/res/layout/biometric_prompt_constraint_layout.xml

+1 −1
Original line number Diff line number Diff line
@@ -150,7 +150,7 @@ 
        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:layout_marginTop="24dp"

        android:accessibilityLiveRegion="polite"

        android:accessibilityLiveRegion="assertive"

        android:fadingEdge="horizontal"

        android:gravity="center_horizontal"

        android:scrollHorizontally="true"

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

+0 −17
Original line number Diff line number Diff line
@@ -112,10 +112,6 @@ object BiometricViewBinder { 
            }



        // set selected to enable marquee unless a screen reader is enabled

        logoView.isSelected =

            !accessibilityManager.isEnabled || !accessibilityManager.isTouchExplorationEnabled

        logoDescriptionView.isSelected =

            !accessibilityManager.isEnabled || !accessibilityManager.isTouchExplorationEnabled

        titleView.isSelected =

            !accessibilityManager.isEnabled || !accessibilityManager.isTouchExplorationEnabled

        subtitleView.isSelected =
@@ -419,19 +415,6 @@ object BiometricViewBinder { 
                        indicatorMessageView.isSelected =

                            !accessibilityManager.isEnabled ||

                                !accessibilityManager.isTouchExplorationEnabled



                        /**

                         * Note: Talkback 14.0 has new rate-limitation design to reduce frequency of

                         * TYPE_WINDOW_CONTENT_CHANGED events to once every 30 seconds. (context:

                         * b/281765653#comment18) Using {@link View#announceForAccessibility}

                         * instead as workaround since sending events exceeding this frequency is

                         * required.

                         */

                        indicatorMessageView?.text?.let {

                            if (it.isNotBlank()) {

                                view.announceForAccessibility(it)

                            }

                        }

                    }

                }