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

Commit a217526c authored by shirleyqian's avatar shirleyqian
Browse files

[a11y] Fix the bug that action label would be read twice. 

Bug: 424699091
Test: local
Flag: com.android.systemui.enable_underlay
Change-Id: Ie0f4957b155c0fddc407a67ad31d80ab8cbfaf1e
parent 1b1a3622

packages/SystemUI/compose/features/src/com/android/systemui/ambientcue/ui/compose/Chip.kt

+3 −1
Original line number Diff line number Diff line
@@ -38,11 +38,13 @@ import androidx.compose.ui.Modifier 
import androidx.compose.ui.draw.alpha

import androidx.compose.ui.draw.clip

import androidx.compose.ui.graphics.Color

import androidx.compose.ui.res.stringResource

import androidx.compose.ui.text.style.TextOverflow

import androidx.compose.ui.unit.dp

import com.android.compose.ui.graphics.painter.rememberDrawablePainter

import com.android.systemui.ambientcue.ui.viewmodel.ActionType

import com.android.systemui.ambientcue.ui.viewmodel.ActionViewModel

import com.android.systemui.res.R



@Composable

fun Chip(action: ActionViewModel, modifier: Modifier = Modifier) {
@@ -63,7 +65,7 @@ fun Chip(action: ActionViewModel, modifier: Modifier = Modifier) { 
        val painter = rememberDrawablePainter(action.icon.drawable)

        Image(

            painter = painter,

            contentDescription = action.label,

            contentDescription = stringResource(id = R.string.ambient_cue_icon_content_description),

            modifier =

                Modifier.size(24.dp)

                    .then(

packages/SystemUI/compose/features/src/com/android/systemui/ambientcue/ui/compose/NavBarPill.kt

+4 −1
Original line number Diff line number Diff line
@@ -241,7 +241,10 @@ fun NavBarPill( 
                                ) {

                                    Image(

                                        painter = rememberDrawablePainter(action.icon.drawable),

                                        contentDescription = action.label,

                                        contentDescription =

                                            stringResource(

                                                id = R.string.ambient_cue_icon_content_description

                                            ),

                                        modifier =

                                            Modifier.size(16.dp).then(iconBorder).clip(CircleShape),

                                    )

packages/SystemUI/compose/features/src/com/android/systemui/ambientcue/ui/compose/ShortPill.kt

+1 −1
Original line number Diff line number Diff line
@@ -261,7 +261,7 @@ private fun CloseButton( 
private fun Icon(action: ActionViewModel, backgroundColor: Color, modifier: Modifier = Modifier) {

    Image(

        painter = rememberDrawablePainter(action.icon.drawable),

        contentDescription = action.label,

        contentDescription = stringResource(id = R.string.ambient_cue_icon_content_description),

        modifier =

            modifier

                .then(

packages/SystemUI/res/values/strings.xml

+3 −0
Original line number Diff line number Diff line
@@ -4368,6 +4368,9 @@ 
    <!-- Description for the Underlay close button. The Underlay view appears on the bottom of the screen and shows some AI hints. The button will dismiss the underlay view. [CHAR LIMIT=NONE] -->

    <string name="underlay_close_button_content_description">Close</string>



    <!-- Description for the Ambient Cue Icon. The icon appears on the bottom of the screen with some AI hints. [CHAR LIMIT=NONE] -->

    <string name="ambient_cue_icon_content_description">Ambient Suggestions Icon</string>



    <!--

    Content of user education tooltip shown to teach the user that they can swipe down from the top

    left edge of the display to expand the notification shade panel.