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

Commit 1a1f5ad4 authored by Matt Pietal's avatar Matt Pietal
Browse files

A11Y - User switcher - Don't focus on Cancel button 

It is the only item initially visible in the layout, and gets
focus and read by talkback. Initially hide all elements until
they views are bound, then set the visibility.

Fixes: 436691870
Test: talkback - launch from user switcher widget
Flag: EXEMPT bugfix
Change-Id: Ic358113c456c97fee7e1cf0d07f57366412abf29
parent 3e46e14c

packages/SystemUI/res/layout/user_switcher_fullscreen.xml

+2 −0
Original line number Diff line number Diff line
@@ -72,6 +72,7 @@ 
        android:paddingHorizontal="@dimen/user_switcher_fullscreen_button_padding"

        android:textSize="@dimen/user_switcher_fullscreen_button_text_size"

        android:textColor="?androidprv:attr/colorAccentPrimary"

        android:visibility="gone"

        android:text="@string/cancel" />



    <TextView
@@ -86,6 +87,7 @@ 
        android:paddingHorizontal="@dimen/user_switcher_fullscreen_button_padding"

        android:textSize="@dimen/user_switcher_fullscreen_button_text_size"

        android:textColor="?androidprv:attr/colorAccentPrimary"

        android:visibility="gone"

        android:text="@string/cancel" />



    <Space

packages/SystemUI/src/com/android/systemui/user/ui/binder/UserSwitcherViewBinder.kt

+2 −0
Original line number Diff line number Diff line
@@ -95,6 +95,8 @@ object UserSwitcherViewBinder { 


            lifecycleScope.launch {

                repeatOnLifecycle(Lifecycle.State.STARTED) {

                    cancelButton.isVisible = true



                    launch { viewModel.isOpenMenuButtonVisible.collect { addButton.isVisible = it } }



                    launch {