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

Commit 611ceca1 authored by Olivier St-Onge's avatar Olivier St-Onge
Browse files

Move the tile decoration content description from the icon to the parent box 

Resizing handles don't have an icon and the content description was not read as a result in Talkback

Test: manually selecting the tile's handle with Talkback
Flag: com.android.systemui.qs_ui_refactor_compose_fragment
Fixes: 412325583
Change-Id: I757333bec70fc6c84d96ab233a29a15b288f991b
parent 465c4874

packages/SystemUI/src/com/android/systemui/qs/panels/ui/compose/selection/Selection.kt

+4 −1
Original line number Original line Diff line number Diff line
@@ -61,6 +61,8 @@ import androidx.compose.ui.graphics.graphicsLayer 
import androidx.compose.ui.graphics.vector.ImageVector

import androidx.compose.ui.graphics.vector.ImageVector

import androidx.compose.ui.layout.layout

import androidx.compose.ui.layout.layout

import androidx.compose.ui.platform.LocalDensity

import androidx.compose.ui.platform.LocalDensity

import androidx.compose.ui.semantics.contentDescription

import androidx.compose.ui.semantics.semantics

import androidx.compose.ui.unit.Constraints

import androidx.compose.ui.unit.Constraints

import androidx.compose.ui.unit.Dp

import androidx.compose.ui.unit.Dp

import androidx.compose.ui.unit.dp

import androidx.compose.ui.unit.dp
@@ -151,11 +153,12 @@ fun InteractiveTileContainer( 
                        orientation = Orientation.Horizontal,

                        orientation = Orientation.Horizontal,

                    )

                    )

                    .clickable(enabled = tileState != None, onClick = onClick)

                    .clickable(enabled = tileState != None, onClick = onClick)

                    .semantics { contentDescription?.let { this.contentDescription = it } }

            ) {

            ) {

                val size = with(LocalDensity.current) { BadgeIconSize.toDp() }

                val size = with(LocalDensity.current) { BadgeIconSize.toDp() }

                Icon(

                Icon(

                    Icons.Default.Remove,

                    Icons.Default.Remove,

                    contentDescription = contentDescription,

                    contentDescription = null,

                    tint = MaterialTheme.colorScheme.onPrimaryContainer,

                    tint = MaterialTheme.colorScheme.onPrimaryContainer,

                    modifier =

                    modifier =

                        Modifier.size(size).align(Alignment.Center).graphicsLayer {

                        Modifier.size(size).align(Alignment.Center).graphicsLayer {