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

Commit 683c3fb6 authored by Matías Hernández's avatar Matías Hernández
Browse files

Fix a11y announcement of the Modes Dialog 

Was "System UI, Modes", is now "Quick Settings, Modes" (like the Internet / Bluetooth dialogs).

Fixes: 369954586
Test: manual
Flag: android.app.modes_ui
Change-Id: If0e89187ea7f3854d4145b440785358b1e3a2b1a
parent 9e4f2a5a

packages/SystemUI/src/com/android/systemui/statusbar/policy/ui/dialog/ModesDialogDelegate.kt

+10 −3
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ import androidx.compose.runtime.remember 
import androidx.compose.ui.Modifier

import androidx.compose.ui.platform.testTag

import androidx.compose.ui.res.stringResource

import androidx.compose.ui.semantics.paneTitle

import androidx.compose.ui.semantics.semantics

import androidx.compose.ui.semantics.testTagsAsResourceId

import androidx.lifecycle.DefaultLifecycleObserver
@@ -102,7 +103,13 @@ constructor( 
        val cachedDarkTheme = remember { isCurrentlyInDarkTheme }

        PlatformTheme(isDarkTheme = cachedDarkTheme) {

            AlertDialogContent(

                modifier = Modifier.semantics { testTagsAsResourceId = true },

                modifier =

                    Modifier.semantics {

                        testTagsAsResourceId = true

                        paneTitle = dialog.context.getString(

                            R.string.accessibility_desc_quick_settings

                        )

                    },

                title = {

                    Text(

                        modifier = Modifier.testTag("modes_title"),
@@ -137,7 +144,7 @@ constructor( 
        }

        activityStarter.startActivity(

            ZEN_MODE_SETTINGS_INTENT,

            true /* dismissShade */,

            /* dismissShade= */ true,

            animationController,

        )

    }
@@ -181,7 +188,7 @@ constructor( 
        if (animationController == null) {

            currentDialog?.dismiss()

        }

        activityStarter.startActivity(intent, true, /* dismissShade */ animationController)

        activityStarter.startActivity(intent, /* dismissShade= */ true, animationController)

    }



    companion object {