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

Commit c0ca7a75 authored by burakov's avatar burakov
Browse files

[Dual Shade] Make ConstrainedNotificationStack unaware of shade width. 

Bug: 395060439
Test: Existing unit tests still pass.
Flag: com.android.systemui.scene_container
Change-Id: I7d71c2cbc7ec9e3c44dd25d6e0eff1d0095a1a94
parent 94664096

packages/SystemUI/compose/features/src/com/android/systemui/keyguard/ui/composable/blueprint/DefaultBlueprint.kt

+3 −3
Original line number Diff line number Diff line
@@ -31,6 +31,7 @@ import androidx.compose.ui.layout.Layout 
import androidx.compose.ui.res.dimensionResource

import androidx.compose.ui.unit.Dp

import androidx.compose.ui.unit.IntRect

import androidx.compose.ui.unit.dp

import androidx.lifecycle.compose.collectAsStateWithLifecycle

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

import com.android.compose.modifiers.padding
@@ -117,12 +118,12 @@ constructor( 
                                        )

                                        Notifications(

                                            areNotificationsVisible = areNotificationsVisible,

                                            isShadeLayoutWide = true,

                                            burnInParams = null,

                                            modifier =

                                                Modifier.fillMaxWidth(0.5f)

                                                    .fillMaxHeight()

                                                    .align(alignment = Alignment.TopEnd),

                                                    .align(alignment = Alignment.TopEnd)

                                                    .padding(top = 12.dp),

                                        )

                                    }

                                }
@@ -150,7 +151,6 @@ constructor( 
                                    }

                                    Notifications(

                                        areNotificationsVisible = areNotificationsVisible,

                                        isShadeLayoutWide = false,

                                        burnInParams = null,

                                    )

                                }

packages/SystemUI/compose/features/src/com/android/systemui/keyguard/ui/composable/section/NotificationSection.kt

+7 −14
Original line number Diff line number Diff line
@@ -23,7 +23,6 @@ import androidx.compose.animation.fadeIn 
import androidx.compose.animation.fadeOut

import androidx.compose.foundation.layout.fillMaxWidth

import androidx.compose.foundation.layout.height

import androidx.compose.foundation.layout.padding

import androidx.compose.runtime.Composable

import androidx.compose.runtime.LaunchedEffect

import androidx.compose.runtime.getValue
@@ -31,11 +30,9 @@ import androidx.compose.runtime.remember 
import androidx.compose.runtime.rememberCoroutineScope

import androidx.compose.ui.Modifier

import androidx.compose.ui.res.dimensionResource

import androidx.compose.ui.unit.dp

import androidx.compose.ui.viewinterop.AndroidView

import androidx.lifecycle.compose.collectAsStateWithLifecycle

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

import com.android.compose.modifiers.thenIf

import com.android.systemui.common.ui.ConfigurationState

import com.android.systemui.dagger.SysUISingleton

import com.android.systemui.keyguard.ui.composable.blueprint.rememberBurnIn
@@ -186,7 +183,6 @@ constructor( 
    @Composable

    fun ContentScope.Notifications(

        areNotificationsVisible: Boolean,

        isShadeLayoutWide: Boolean,

        burnInParams: BurnInParameters?,

        modifier: Modifier = Modifier,

    ) {
@@ -198,10 +194,7 @@ constructor( 
            stackScrollView = stackScrollView.get(),

            viewModel = rememberViewModel("Notifications") { viewModelFactory.create() },

            modifier =

                modifier

                    .fillMaxWidth()

                    .thenIf(isShadeLayoutWide) { Modifier.padding(top = 12.dp) }

                    .let {

                modifier.fillMaxWidth().let {

                    if (burnInParams == null) {

                        it

                    } else {