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

Commit c814aace authored by Jeff DeCew's avatar Jeff DeCew
Browse files

[flexiglass] Make SharedNotificationContainerBinder an injectable instance 

Bug: 296118689
Test: atest SystemUITests
Flag: ACONFIG com.android.systemui.migrate_clocks_to_blueprint TEAMFOOD
Change-Id: Id61f2c0dedc7fde9482f0fc488a9c7cc927185d4
parent 6fac1418

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

+2 −12
Original line number Diff line number Diff line
@@ -22,33 +22,27 @@ 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.Main

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

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

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.NotificationStackViewBinder

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

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

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

import javax.inject.Inject

import kotlinx.coroutines.CoroutineDispatcher



@SysUISingleton

class NotificationSection

@Inject

constructor(

    private val viewModel: NotificationsPlaceholderViewModel,

    controller: NotificationStackScrollLayoutController,

    sceneContainerFlags: SceneContainerFlags,

    sharedNotificationContainer: SharedNotificationContainer,

    sharedNotificationContainerViewModel: SharedNotificationContainerViewModel,

    stackScrollLayout: NotificationStackScrollLayout,

    notificationStackSizeCalculator: NotificationStackSizeCalculator,

    sharedNotificationContainerBinder: SharedNotificationContainerBinder,

    notificationStackViewBinder: NotificationStackViewBinder,

    @Main private val mainImmediateDispatcher: CoroutineDispatcher,

) {



    init {
@@ -67,13 +61,9 @@ constructor( 
            sharedNotificationContainer.addNotificationStackScrollLayout(stackScrollLayout)

        }



        SharedNotificationContainerBinder.bind(

        sharedNotificationContainerBinder.bind(

            sharedNotificationContainer,

            sharedNotificationContainerViewModel,

            sceneContainerFlags,

            controller,

            notificationStackSizeCalculator,

            mainImmediateDispatcher = mainImmediateDispatcher,

        )



        if (sceneContainerFlags.isEnabled()) {

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

+3 −10
Original line number Diff line number Diff line
@@ -26,19 +26,16 @@ import androidx.constraintlayout.widget.ConstraintSet.START 
import androidx.constraintlayout.widget.ConstraintSet.TOP

import com.android.systemui.Flags.centralizedStatusBarHeightFix

import com.android.systemui.Flags.migrateClocksToBlueprint

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

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.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.NotificationStackViewBinder

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

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

import dagger.Lazy

import javax.inject.Inject

import kotlinx.coroutines.CoroutineDispatcher



/** Single column format for notifications (default for phones) */

class DefaultNotificationStackScrollLayoutSection
@@ -49,11 +46,9 @@ constructor( 
    notificationPanelView: NotificationPanelView,

    sharedNotificationContainer: SharedNotificationContainer,

    sharedNotificationContainerViewModel: SharedNotificationContainerViewModel,

    sharedNotificationContainerBinder: SharedNotificationContainerBinder,

    notificationStackViewBinder: NotificationStackViewBinder,

    controller: NotificationStackScrollLayoutController,

    notificationStackSizeCalculator: NotificationStackSizeCalculator,

    private val largeScreenHeaderHelperLazy: Lazy<LargeScreenHeaderHelper>,

    @Main mainDispatcher: CoroutineDispatcher,

) :

    NotificationStackScrollLayoutSection(

        context,
@@ -61,10 +56,8 @@ constructor( 
        notificationPanelView,

        sharedNotificationContainer,

        sharedNotificationContainerViewModel,

        sharedNotificationContainerBinder,

        notificationStackViewBinder,

        controller,

        notificationStackSizeCalculator,

        mainDispatcher,

    ) {

    override fun applyConstraints(constraintSet: ConstraintSet) {

        if (!migrateClocksToBlueprint()) {

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

+2 −11
Original line number Diff line number Diff line
@@ -31,13 +31,10 @@ 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.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.NotificationStackViewBinder

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

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

import kotlinx.coroutines.CoroutineDispatcher

import kotlinx.coroutines.DisposableHandle



abstract class NotificationStackScrollLayoutSection
@@ -47,10 +44,8 @@ constructor( 
    private val notificationPanelView: NotificationPanelView,

    private val sharedNotificationContainer: SharedNotificationContainer,

    private val sharedNotificationContainerViewModel: SharedNotificationContainerViewModel,

    private val sharedNotificationContainerBinder: SharedNotificationContainerBinder,

    private val notificationStackViewBinder: NotificationStackViewBinder,

    private val controller: NotificationStackScrollLayoutController,

    private val notificationStackSizeCalculator: NotificationStackSizeCalculator,

    private val mainDispatcher: CoroutineDispatcher,

) : KeyguardSection() {

    private val placeHolderId = R.id.nssl_placeholder

    private val disposableHandles: MutableList<DisposableHandle> = mutableListOf()
@@ -101,13 +96,9 @@ constructor( 


        disposeHandles()

        disposableHandles.add(

            SharedNotificationContainerBinder.bind(

            sharedNotificationContainerBinder.bind(

                sharedNotificationContainer,

                sharedNotificationContainerViewModel,

                sceneContainerFlags,

                controller,

                notificationStackSizeCalculator,

                mainImmediateDispatcher = mainDispatcher,

            )

        )

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

+3 −12
Original line number Diff line number Diff line
@@ -24,18 +24,14 @@ import androidx.constraintlayout.widget.ConstraintSet.PARENT_ID 
import androidx.constraintlayout.widget.ConstraintSet.START

import androidx.constraintlayout.widget.ConstraintSet.TOP

import com.android.systemui.Flags.migrateClocksToBlueprint

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

import com.android.systemui.keyguard.ui.viewmodel.KeyguardSmartspaceViewModel

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.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.NotificationStackViewBinder

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

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

import javax.inject.Inject

import kotlinx.coroutines.CoroutineDispatcher



/** Large-screen format for notifications, shown as two columns on the device */

class SplitShadeNotificationStackScrollLayoutSection
@@ -46,11 +42,8 @@ constructor( 
    notificationPanelView: NotificationPanelView,

    sharedNotificationContainer: SharedNotificationContainer,

    sharedNotificationContainerViewModel: SharedNotificationContainerViewModel,

    sharedNotificationContainerBinder: SharedNotificationContainerBinder,

    notificationStackViewBinder: NotificationStackViewBinder,

    controller: NotificationStackScrollLayoutController,

    notificationStackSizeCalculator: NotificationStackSizeCalculator,

    private val smartspaceViewModel: KeyguardSmartspaceViewModel,

    @Main mainDispatcher: CoroutineDispatcher,

) :

    NotificationStackScrollLayoutSection(

        context,
@@ -58,10 +51,8 @@ constructor( 
        notificationPanelView,

        sharedNotificationContainer,

        sharedNotificationContainerViewModel,

        sharedNotificationContainerBinder,

        notificationStackViewBinder,

        controller,

        notificationStackSizeCalculator,

        mainDispatcher,

    ) {

    override fun applyConstraints(constraintSet: ConstraintSet) {

        if (!migrateClocksToBlueprint()) {

packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/ui/viewbinder/SharedNotificationContainerBinder.kt

+11 −6
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ import android.view.View 
import android.view.WindowInsets

import androidx.lifecycle.Lifecycle

import androidx.lifecycle.repeatOnLifecycle

import com.android.systemui.dagger.SysUISingleton

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

import com.android.systemui.keyguard.ui.viewmodel.BurnInParameters

import com.android.systemui.keyguard.ui.viewmodel.ViewStateAccessor
@@ -30,6 +31,7 @@ import com.android.systemui.statusbar.notification.stack.NotificationStackScroll 
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.SharedNotificationContainerViewModel

import javax.inject.Inject

import kotlinx.coroutines.CoroutineDispatcher

import kotlinx.coroutines.DisposableHandle

import kotlinx.coroutines.flow.MutableStateFlow
@@ -38,16 +40,19 @@ import kotlinx.coroutines.flow.update 
import kotlinx.coroutines.launch



/** Binds the shared notification container to its view-model. */

object SharedNotificationContainerBinder {

@SysUISingleton

class SharedNotificationContainerBinder

@Inject

constructor(

    private val sceneContainerFlags: SceneContainerFlags,

    private val controller: NotificationStackScrollLayoutController,

    private val notificationStackSizeCalculator: NotificationStackSizeCalculator,

    @Main private val mainImmediateDispatcher: CoroutineDispatcher,

) {



    @JvmStatic

    fun bind(

        view: SharedNotificationContainer,

        viewModel: SharedNotificationContainerViewModel,

        sceneContainerFlags: SceneContainerFlags,

        controller: NotificationStackScrollLayoutController,

        notificationStackSizeCalculator: NotificationStackSizeCalculator,

        @Main mainImmediateDispatcher: CoroutineDispatcher,

    ): DisposableHandle {

        val disposableHandle =

            view.repeatWhenAttached {