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

Commit 6fac1418 authored by Jeff DeCew's avatar Jeff DeCew
Browse files

[flexiglass] Make NotificationStackViewBinder an injectable instance 

Bug: 296118689
Test: atest SystemUITests
Flag: ACONFIG com.android.systemui.scene_container DEVELOPMENT
Change-Id: Ib5f2151dccd85b9c7c525367d3eec6c0e43d28d0
parent 213e816d

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

+3 −16
Original line number Diff line number Diff line
@@ -16,25 +16,21 @@ 


package com.android.systemui.keyguard.ui.composable.section



import android.content.Context

import android.view.ViewGroup

import androidx.compose.runtime.Composable

import androidx.compose.ui.Modifier

import com.android.compose.animation.scene.SceneScope

import com.android.systemui.Flags.migrateClocksToBlueprint

import com.android.systemui.dagger.SysUISingleton

import com.android.systemui.dagger.qualifiers.Application

import com.android.systemui.dagger.qualifiers.Main

import com.android.systemui.notifications.ui.composable.NotificationStack

import com.android.systemui.scene.shared.flag.SceneContainerFlags

import com.android.systemui.statusbar.notification.stack.AmbientState

import com.android.systemui.statusbar.notification.stack.NotificationStackScrollLayout

import com.android.systemui.statusbar.notification.stack.NotificationStackScrollLayoutController

import com.android.systemui.statusbar.notification.stack.NotificationStackSizeCalculator

import com.android.systemui.statusbar.notification.stack.ui.view.SharedNotificationContainer

import com.android.systemui.statusbar.notification.stack.ui.viewbinder.NotificationStackAppearanceViewBinder

import com.android.systemui.statusbar.notification.stack.ui.viewbinder.NotificationStackViewBinder

import com.android.systemui.statusbar.notification.stack.ui.viewbinder.SharedNotificationContainerBinder

import com.android.systemui.statusbar.notification.stack.ui.viewmodel.NotificationStackAppearanceViewModel

import com.android.systemui.statusbar.notification.stack.ui.viewmodel.NotificationsPlaceholderViewModel

import com.android.systemui.statusbar.notification.stack.ui.viewmodel.SharedNotificationContainerViewModel

import javax.inject.Inject
@@ -44,16 +40,14 @@ import kotlinx.coroutines.CoroutineDispatcher 
class NotificationSection

@Inject

constructor(

    @Application private val context: Context,

    private val viewModel: NotificationsPlaceholderViewModel,

    controller: NotificationStackScrollLayoutController,

    sceneContainerFlags: SceneContainerFlags,

    sharedNotificationContainer: SharedNotificationContainer,

    sharedNotificationContainerViewModel: SharedNotificationContainerViewModel,

    stackScrollLayout: NotificationStackScrollLayout,

    notificationStackAppearanceViewModel: NotificationStackAppearanceViewModel,

    ambientState: AmbientState,

    notificationStackSizeCalculator: NotificationStackSizeCalculator,

    notificationStackViewBinder: NotificationStackViewBinder,

    @Main private val mainImmediateDispatcher: CoroutineDispatcher,

) {
@@ -83,14 +77,7 @@ constructor( 
        )



        if (sceneContainerFlags.isEnabled()) {

            NotificationStackAppearanceViewBinder.bind(

                context,

                sharedNotificationContainer,

                notificationStackAppearanceViewModel,

                ambientState,

                controller,

                mainImmediateDispatcher = mainImmediateDispatcher,

            )

            notificationStackViewBinder.bindWhileAttached()

        }

    }

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

+7 −3
Original line number Diff line number Diff line
@@ -57,6 +57,7 @@ import androidx.compose.ui.layout.onSizeChanged 
import androidx.compose.ui.layout.positionInWindow

import androidx.compose.ui.platform.LocalConfiguration

import androidx.compose.ui.platform.LocalDensity

import androidx.compose.ui.res.dimensionResource

import androidx.compose.ui.unit.Dp

import androidx.compose.ui.unit.IntOffset

import androidx.compose.ui.unit.IntSize
@@ -70,10 +71,10 @@ import com.android.systemui.common.ui.compose.windowinsets.LocalScreenCornerRadi 
import com.android.systemui.notifications.ui.composable.Notifications.Form

import com.android.systemui.notifications.ui.composable.Notifications.TransitionThresholds.EXPANSION_FOR_MAX_CORNER_RADIUS

import com.android.systemui.notifications.ui.composable.Notifications.TransitionThresholds.EXPANSION_FOR_MAX_SCRIM_ALPHA

import com.android.systemui.res.R

import com.android.systemui.scene.shared.model.Scenes

import com.android.systemui.shade.ui.composable.ShadeHeader

import com.android.systemui.statusbar.notification.stack.shared.model.StackRounding

import com.android.systemui.statusbar.notification.stack.ui.viewbinder.NotificationStackAppearanceViewBinder.SCRIM_CORNER_RADIUS

import com.android.systemui.statusbar.notification.stack.ui.viewmodel.NotificationsPlaceholderViewModel

import kotlin.math.roundToInt
@@ -140,6 +141,7 @@ fun SceneScope.NotificationScrollingStack( 
) {

    val density = LocalDensity.current

    val screenCornerRadius = LocalScreenCornerRadius.current

    val scrimCornerRadius = dimensionResource(R.dimen.notification_scrim_corner_radius)

    val scrollState = rememberScrollState()

    val syntheticScroll = viewModel.syntheticScroll.collectAsState(0f)

    val expansionFraction by viewModel.expandFraction.collectAsState(0f)
@@ -225,6 +227,7 @@ fun SceneScope.NotificationScrollingStack( 
                .graphicsLayer {

                    shape =

                        calculateCornerRadius(

                                scrimCornerRadius,

                                screenCornerRadius,

                                { expansionFraction },

                                layoutState.isTransitioningBetween(Scenes.Gone, Scenes.Shade)
@@ -357,6 +360,7 @@ private fun SceneScope.NotificationPlaceholder( 
}



private fun calculateCornerRadius(

    scrimCornerRadius: Dp,

    screenCornerRadius: Dp,

    expansionFraction: () -> Float,

    transitioning: Boolean,
@@ -364,12 +368,12 @@ private fun calculateCornerRadius( 
    return if (transitioning) {

        lerp(

                start = screenCornerRadius.value,

                stop = SCRIM_CORNER_RADIUS,

                stop = scrimCornerRadius.value,

                fraction = (expansionFraction() / EXPANSION_FOR_MAX_CORNER_RADIUS).coerceIn(0f, 1f),

            )

            .dp

    } else {

        SCRIM_CORNER_RADIUS.dp

        scrimCornerRadius

    }

}

packages/SystemUI/src/com/android/systemui/common/ui/ConfigurationState.kt

+12 −0
Original line number Diff line number Diff line
@@ -53,6 +53,18 @@ constructor( 
        }

    }



    /**

     * Returns a [Flow] that emits a dimension pixel size that is kept in sync with the device

     * configuration.

     *

     * @see android.content.res.Resources.getDimensionPixelSize

     */

    fun getDimensionPixelOffset(@DimenRes id: Int): Flow<Int> {

        return configurationController.onDensityOrFontScaleChanged.emitOnStart().map {

            context.resources.getDimensionPixelOffset(id)

        }

    }



    /**

     * Returns a [Flow] that emits a color that is kept in sync with the device theme.

     *

packages/SystemUI/src/com/android/systemui/keyguard/ui/view/layout/sections/DefaultNotificationStackScrollLayoutSection.kt

+3 −6
Original line number Diff line number Diff line
@@ -31,11 +31,10 @@ import com.android.systemui.res.R 
import com.android.systemui.scene.shared.flag.SceneContainerFlags

import com.android.systemui.shade.LargeScreenHeaderHelper

import com.android.systemui.shade.NotificationPanelView

import com.android.systemui.statusbar.notification.stack.AmbientState

import com.android.systemui.statusbar.notification.stack.NotificationStackScrollLayoutController

import com.android.systemui.statusbar.notification.stack.NotificationStackSizeCalculator

import com.android.systemui.statusbar.notification.stack.ui.view.SharedNotificationContainer

import com.android.systemui.statusbar.notification.stack.ui.viewmodel.NotificationStackAppearanceViewModel

import com.android.systemui.statusbar.notification.stack.ui.viewbinder.NotificationStackViewBinder

import com.android.systemui.statusbar.notification.stack.ui.viewmodel.SharedNotificationContainerViewModel

import dagger.Lazy

import javax.inject.Inject
@@ -50,8 +49,7 @@ constructor( 
    notificationPanelView: NotificationPanelView,

    sharedNotificationContainer: SharedNotificationContainer,

    sharedNotificationContainerViewModel: SharedNotificationContainerViewModel,

    notificationStackAppearanceViewModel: NotificationStackAppearanceViewModel,

    ambientState: AmbientState,

    notificationStackViewBinder: NotificationStackViewBinder,

    controller: NotificationStackScrollLayoutController,

    notificationStackSizeCalculator: NotificationStackSizeCalculator,

    private val largeScreenHeaderHelperLazy: Lazy<LargeScreenHeaderHelper>,
@@ -63,8 +61,7 @@ constructor( 
        notificationPanelView,

        sharedNotificationContainer,

        sharedNotificationContainerViewModel,

        notificationStackAppearanceViewModel,

        ambientState,

        notificationStackViewBinder,

        controller,

        notificationStackSizeCalculator,

        mainDispatcher,

packages/SystemUI/src/com/android/systemui/keyguard/ui/view/layout/sections/NotificationStackScrollLayoutSection.kt

+3 −15
Original line number Diff line number Diff line
@@ -31,13 +31,11 @@ import com.android.systemui.keyguard.shared.model.KeyguardSection 
import com.android.systemui.res.R

import com.android.systemui.scene.shared.flag.SceneContainerFlags

import com.android.systemui.shade.NotificationPanelView

import com.android.systemui.statusbar.notification.stack.AmbientState

import com.android.systemui.statusbar.notification.stack.NotificationStackScrollLayoutController

import com.android.systemui.statusbar.notification.stack.NotificationStackSizeCalculator

import com.android.systemui.statusbar.notification.stack.ui.view.SharedNotificationContainer

import com.android.systemui.statusbar.notification.stack.ui.viewbinder.NotificationStackAppearanceViewBinder

import com.android.systemui.statusbar.notification.stack.ui.viewbinder.NotificationStackViewBinder

import com.android.systemui.statusbar.notification.stack.ui.viewbinder.SharedNotificationContainerBinder

import com.android.systemui.statusbar.notification.stack.ui.viewmodel.NotificationStackAppearanceViewModel

import com.android.systemui.statusbar.notification.stack.ui.viewmodel.SharedNotificationContainerViewModel

import kotlinx.coroutines.CoroutineDispatcher

import kotlinx.coroutines.DisposableHandle
@@ -49,8 +47,7 @@ constructor( 
    private val notificationPanelView: NotificationPanelView,

    private val sharedNotificationContainer: SharedNotificationContainer,

    private val sharedNotificationContainerViewModel: SharedNotificationContainerViewModel,

    private val notificationStackAppearanceViewModel: NotificationStackAppearanceViewModel,

    private val ambientState: AmbientState,

    private val notificationStackViewBinder: NotificationStackViewBinder,

    private val controller: NotificationStackScrollLayoutController,

    private val notificationStackSizeCalculator: NotificationStackSizeCalculator,

    private val mainDispatcher: CoroutineDispatcher,
@@ -115,16 +112,7 @@ constructor( 
        )



        if (sceneContainerFlags.isEnabled()) {

            disposableHandles.add(

                NotificationStackAppearanceViewBinder.bind(

                    context,

                    sharedNotificationContainer,

                    notificationStackAppearanceViewModel,

                    ambientState,

                    controller,

                    mainImmediateDispatcher = mainDispatcher,

                )

            )

            disposableHandles.add(notificationStackViewBinder.bindWhileAttached())

        }

    }