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

Commit 4c269cdc authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "[Dual Shade] Add sysUiRes tags to both shades, for E2E tests." into main

parents 4e2da92c c2f8246c

packages/SystemUI/compose/features/src/com/android/systemui/notifications/ui/composable/Notifications.kt

+2 −0
Original line number Diff line number Diff line
@@ -99,6 +99,7 @@ import com.android.compose.modifiers.thenIf 
import com.android.internal.jank.InteractionJankMonitor

import com.android.internal.jank.InteractionJankMonitor.CUJ_NOTIFICATION_SHADE_SCROLL_FLING

import com.android.systemui.common.ui.compose.windowinsets.LocalScreenCornerRadius

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

import com.android.systemui.res.R

import com.android.systemui.scene.session.ui.composable.SaveableSession

import com.android.systemui.scene.session.ui.composable.sessionCoroutineScope
@@ -503,6 +504,7 @@ fun ContentScope.NotificationScrollingStack( 
    Box(

        modifier =

            modifier

                .sysuiResTag("notification_stack_scroller")

                .element(Notifications.Elements.NotificationScrim)

                .overscroll(verticalOverscrollEffect)

                .offset {

packages/SystemUI/compose/features/src/com/android/systemui/qs/ui/composable/QuickSettingsShadeOverlay.kt

+1 −0
Original line number Diff line number Diff line
@@ -187,6 +187,7 @@ fun ContentScope.QuickSettingsContainer( 
        if (QsDetailedView.isEnabled) viewModel.detailsViewModel.activeTileDetails else null



    AnimatedContent(

        modifier = Modifier.sysuiResTag("quick_settings_container"),

        targetState =

            when {

                isEditing -> ShadeBodyState.Editing