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

Commit b5ae989a authored by William Leshner's avatar William Leshner Committed by Android (Google) Code Review
Browse files

Merge "Fix a bug with status bar location on hub." into main

parents 23d0e535 61fbc208

packages/SystemUI/compose/features/src/com/android/systemui/communal/ui/compose/CommunalContainer.kt

+12 −0
Original line number Diff line number Diff line
@@ -13,6 +13,7 @@ import androidx.compose.foundation.isSystemInDarkTheme 
import androidx.compose.foundation.layout.Box

import androidx.compose.foundation.layout.BoxScope

import androidx.compose.foundation.layout.fillMaxSize

import androidx.compose.foundation.layout.fillMaxWidth

import androidx.compose.material3.MaterialTheme

import androidx.compose.runtime.Composable

import androidx.compose.runtime.DisposableEffect
@@ -34,6 +35,7 @@ import androidx.compose.ui.semantics.clearAndSetSemantics 
import androidx.compose.ui.semantics.disabled

import androidx.compose.ui.semantics.semantics

import androidx.compose.ui.unit.dp

import androidx.compose.ui.zIndex

import androidx.lifecycle.compose.collectAsStateWithLifecycle

import com.android.compose.animation.scene.ContentKey

import com.android.compose.animation.scene.ContentScope
@@ -56,6 +58,7 @@ import com.android.systemui.communal.shared.model.CommunalScenes 
import com.android.systemui.communal.shared.model.CommunalTransitionKeys

import com.android.systemui.communal.ui.compose.Dimensions.Companion.SlideOffsetY

import com.android.systemui.communal.ui.compose.extensions.allowGestures

import com.android.systemui.communal.ui.compose.section.AmbientStatusBarSection

import com.android.systemui.communal.ui.viewmodel.CommunalViewModel

import com.android.systemui.communal.util.CommunalColors

import com.android.systemui.keyguard.domain.interactor.FromAodTransitionInteractor
@@ -209,6 +212,7 @@ fun CommunalContainer( 
    dataSourceDelegator: SceneDataSourceDelegator,

    colors: CommunalColors,

    content: CommunalContent,

    ambientStatusBarSection: AmbientStatusBarSection,

) {

    val coroutineScope = rememberCoroutineScope()

    val currentSceneKey: SceneKey by viewModel.currentScene.collectAsStateWithLifecycle()
@@ -288,6 +292,7 @@ fun CommunalContainer( 
                backgroundType = backgroundType,

                colors = colors,

                content = content,

                ambientStatusBarSection = ambientStatusBarSection,

                viewModel = viewModel,

            )

        }
@@ -318,6 +323,7 @@ fun ContentScope.CommunalScene( 
    backgroundType: CommunalBackgroundType,

    colors: CommunalColors,

    content: CommunalContent,

    ambientStatusBarSection: AmbientStatusBarSection,

    viewModel: CommunalViewModel,

    modifier: Modifier = Modifier,

) {
@@ -346,6 +352,12 @@ fun ContentScope.CommunalScene( 
            CommunalBackgroundType.SCRIM -> Scrimmed()

        }



        if (!Flags.glanceableHubV2()) {

            with(ambientStatusBarSection) {

                AmbientStatusBar(modifier = Modifier.fillMaxWidth().zIndex(1f))

            }

        }



        with(content) {

            Content(

                modifier =

packages/SystemUI/compose/features/src/com/android/systemui/communal/ui/compose/CommunalContent.kt

+0 −6
Original line number Diff line number Diff line
@@ -29,7 +29,6 @@ import androidx.compose.ui.unit.Constraints 
import androidx.compose.ui.unit.Dp

import androidx.compose.ui.unit.IntRect

import androidx.compose.ui.unit.dp

import androidx.compose.ui.zIndex

import com.android.compose.animation.scene.ContentScope

import com.android.systemui.Flags

import com.android.systemui.communal.domain.interactor.CommunalSettingsInteractor
@@ -74,11 +73,6 @@ constructor( 
                content = {

                    Box(modifier = Modifier.fillMaxSize()) {

                        with(communalPopupSection) { Popup() }

                        if (!Flags.glanceableHubV2()) {

                            with(ambientStatusBarSection) {

                                AmbientStatusBar(modifier = Modifier.fillMaxWidth().zIndex(1f))

                            }

                        }

                        CommunalHub(

                            viewModel = viewModel,

                            interactionHandler = interactionHandler,

packages/SystemUI/compose/features/src/com/android/systemui/communal/ui/compose/CommunalScene.kt

+3 −0
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ import com.android.compose.animation.scene.ContentScope 
import com.android.compose.animation.scene.UserAction

import com.android.compose.animation.scene.UserActionResult

import com.android.systemui.communal.shared.model.CommunalBackgroundType

import com.android.systemui.communal.ui.compose.section.AmbientStatusBarSection

import com.android.systemui.communal.ui.viewmodel.CommunalUserActionsViewModel

import com.android.systemui.communal.ui.viewmodel.CommunalViewModel

import com.android.systemui.communal.util.CommunalColors
@@ -43,6 +44,7 @@ constructor( 
    actionsViewModelFactory: CommunalUserActionsViewModel.Factory,

    private val communalColors: CommunalColors,

    private val communalContent: CommunalContent,

    private val ambientStatusBarSection: AmbientStatusBarSection,

) : ExclusiveActivatable(), Scene {

    override val key = Scenes.Communal
@@ -65,6 +67,7 @@ constructor( 
            backgroundType = backgroundType,

            colors = communalColors,

            content = communalContent,

            ambientStatusBarSection = ambientStatusBarSection,

            viewModel = contentViewModel,

        )

    }

packages/SystemUI/src/com/android/systemui/shade/GlanceableHubContainerController.kt

+3 −0
Original line number Diff line number Diff line
@@ -50,6 +50,7 @@ import com.android.systemui.communal.domain.interactor.CommunalInteractor 
import com.android.systemui.communal.domain.interactor.CommunalSettingsInteractor

import com.android.systemui.communal.ui.compose.CommunalContainer

import com.android.systemui.communal.ui.compose.CommunalContent

import com.android.systemui.communal.ui.compose.section.AmbientStatusBarSection

import com.android.systemui.communal.ui.viewmodel.CommunalViewModel

import com.android.systemui.communal.util.CommunalColors

import com.android.systemui.communal.util.UserTouchActivityNotifier
@@ -100,6 +101,7 @@ constructor( 
    private val keyguardMediaController: KeyguardMediaController,

    private val lockscreenSmartspaceController: LockscreenSmartspaceController,

    private val userTouchActivityNotifier: UserTouchActivityNotifier,

    private val ambientStatusBarSection: AmbientStatusBarSection,

    @CommunalTouchLog logBuffer: LogBuffer,

    private val userActivityNotifier: UserActivityNotifier,

) : LifecycleOwner {
@@ -309,6 +311,7 @@ constructor( 
                                        viewModel = communalViewModel,

                                        colors = communalColors,

                                        dataSourceDelegator = dataSourceDelegator,

                                        ambientStatusBarSection = ambientStatusBarSection,

                                        content = communalContent,

                                    )

                                }

packages/SystemUI/tests/src/com/android/systemui/shade/GlanceableHubContainerControllerTest.kt

+5 −0
Original line number Diff line number Diff line
@@ -44,6 +44,7 @@ import com.android.systemui.communal.domain.interactor.setCommunalAvailable 
import com.android.systemui.communal.domain.interactor.setCommunalV2ConfigEnabled

import com.android.systemui.communal.shared.model.CommunalScenes

import com.android.systemui.communal.ui.compose.CommunalContent

import com.android.systemui.communal.ui.compose.section.AmbientStatusBarSection

import com.android.systemui.communal.ui.viewmodel.CommunalViewModel

import com.android.systemui.communal.util.CommunalColors

import com.android.systemui.communal.util.userTouchActivityNotifier
@@ -136,6 +137,7 @@ class GlanceableHubContainerControllerTest : SysuiTestCase() { 
                keyguardMediaController,

                lockscreenSmartspaceController,

                userTouchActivityNotifier,

                mock<AmbientStatusBarSection>(),

                logcatLogBuffer("GlanceableHubContainerControllerTest"),

                kosmos.userActivityNotifier,

            )
@@ -178,6 +180,7 @@ class GlanceableHubContainerControllerTest : SysuiTestCase() { 
                    keyguardMediaController,

                    lockscreenSmartspaceController,

                    userTouchActivityNotifier,

                    mock<AmbientStatusBarSection>(),

                    logcatLogBuffer("GlanceableHubContainerControllerTest"),

                    kosmos.userActivityNotifier,

                )
@@ -209,6 +212,7 @@ class GlanceableHubContainerControllerTest : SysuiTestCase() { 
                    keyguardMediaController,

                    lockscreenSmartspaceController,

                    userTouchActivityNotifier,

                    mock<AmbientStatusBarSection>(),

                    logcatLogBuffer("GlanceableHubContainerControllerTest"),

                    kosmos.userActivityNotifier,

                )
@@ -236,6 +240,7 @@ class GlanceableHubContainerControllerTest : SysuiTestCase() { 
                    keyguardMediaController,

                    lockscreenSmartspaceController,

                    userTouchActivityNotifier,

                    mock<AmbientStatusBarSection>(),

                    logcatLogBuffer("GlanceableHubContainerControllerTest"),

                    kosmos.userActivityNotifier,

                )