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

Commit f1b337a3 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "A11Y - User switcher - Don't focus on Cancel button" into main

parents dc4d0b94 1a1f5ad4

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 {