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

Commit 2b4abbbe authored by Anton Potapov's avatar Anton Potapov
Browse files

Add test tags for the VolumePanel. 

Flag: com.android.systemui.new_volume_panel
Bug: 348365177
Test: atest VolumePanelScreenshotTests
Test: atest AdjustVolumeTest
Test: manual with voiceover on
Change-Id: I504c5e496049077521e6d9d5f4db8ebac56ac4ad
parent 3d879a03

packages/SystemUI/compose/features/src/com/android/systemui/volume/panel/component/volume/ui/composable/VolumeSlider.kt

+2 −1
Original line number Diff line number Diff line
@@ -48,6 +48,7 @@ import com.android.compose.PlatformSlider 
import com.android.compose.PlatformSliderColors

import com.android.systemui.common.shared.model.Icon

import com.android.systemui.common.ui.compose.Icon

import com.android.systemui.compose.modifiers.sysuiResTag

import com.android.systemui.volume.panel.component.volume.slider.ui.viewmodel.SliderState



@Composable
@@ -62,7 +63,7 @@ fun VolumeSlider( 
    val value by valueState(state)

    PlatformSlider(

        modifier =

            modifier.clearAndSetSemantics {

            modifier.sysuiResTag(state.label).clearAndSetSemantics {

                if (state.isEnabled) {

                    contentDescription = state.label

                    state.a11yClickDescription?.let {

packages/SystemUI/compose/features/src/com/android/systemui/volume/panel/ui/composable/VolumePanelRoot.kt

+6 −0
Original line number Diff line number Diff line
@@ -25,20 +25,25 @@ import androidx.compose.foundation.layout.padding 
import androidx.compose.runtime.Composable

import androidx.compose.runtime.getValue

import androidx.compose.ui.Alignment

import androidx.compose.ui.ExperimentalComposeUiApi

import androidx.compose.ui.Modifier

import androidx.compose.ui.res.stringResource

import androidx.compose.ui.semantics.paneTitle

import androidx.compose.ui.semantics.semantics

import androidx.compose.ui.unit.dp

import androidx.lifecycle.compose.collectAsStateWithLifecycle

import com.android.systemui.compose.modifiers.sysuiResTag

import com.android.systemui.res.R

import com.android.systemui.volume.panel.ui.layout.ComponentsLayout

import com.android.systemui.volume.panel.ui.viewmodel.VolumePanelState

import com.android.systemui.volume.panel.ui.viewmodel.VolumePanelViewModel



/** Same as android.platform.systemui_tapl.ui.VolumePanel#VolumePanelTestTag */

private const val VolumePanelTestTag = "VolumePanel"

private val padding = 24.dp



@Composable

@OptIn(ExperimentalComposeUiApi::class)

fun VolumePanelRoot(

    viewModel: VolumePanelViewModel,

    modifier: Modifier = Modifier,
@@ -52,6 +57,7 @@ fun VolumePanelRoot( 
            Components(

                componentsState,

                modifier

                    .sysuiResTag(VolumePanelTestTag)

                    .semantics { paneTitle = accessibilityTitle }

                    .padding(

                        start = padding,