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

Commit 41510b0c authored by cocod's avatar cocod
Browse files

Set selected widget key for SwitchAccess edit widget action 

Widgets aren't highlighted when entering edit mode using Switch
Access, as it doesn't automatically handle long press like TalkBack.
So the selected widget's key needs to be set in the custom action
handler.
Also clear the key if entering edit mode from empty space in hub.

Fixes: 378616348
Flag: EXEMPT bugfix
Test: manually with SwitchAccess enabled
Change-Id: Ie6b362878ad1e5373c4fea32b8b38cd74d4b364a
parent 68673d19

packages/SystemUI/compose/features/src/com/android/systemui/communal/ui/compose/CommunalHub.kt

+5 −2
Original line number Diff line number Diff line
@@ -1451,7 +1451,6 @@ private fun WidgetContent( 
        } else {

            Modifier

        }



    Box(

        modifier =

            modifier
@@ -1539,7 +1538,10 @@ private fun WidgetContent( 
        with(widgetSection) {

            Widget(

                isFocusable = isFocusable,

                openWidgetEditor = { viewModel.onOpenWidgetEditor() },

                openWidgetEditor = {

                    viewModel.setSelectedKey(model.key)

                    viewModel.onOpenWidgetEditor()

                },

                model = model,

                size = size,

                modifier = Modifier.fillMaxSize().allowGestures(allowed = !viewModel.isEditMode),
@@ -1788,6 +1790,7 @@ fun AccessibilityContainer(viewModel: BaseCommunalViewModel, content: @Composabl 
                            CustomAccessibilityAction(

                                context.getString(R.string.accessibility_action_label_edit_widgets)

                            ) {

                                viewModel.setSelectedKey(null)

                                viewModel.onOpenWidgetEditor()

                                true

                            },