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

Commit 9a72f7a6 authored by Ale Nijamkin's avatar Ale Nijamkin Committed by Android (Google) Code Review
Browse files

Merge "[flexiglass] Removes redundant notifications property" into main

parents b1f65ff2 930710a9

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

+5 −3
Original line number Diff line number Diff line
@@ -177,8 +177,10 @@ private fun SceneScope.QuickSettingsScene( 
            label = "alphaAnimationBrightnessMirrorContentHiding",

        )



    viewModel.notifications.setAlphaForBrightnessMirror(contentAlpha)

    DisposableEffect(Unit) { onDispose { viewModel.notifications.setAlphaForBrightnessMirror(1f) } }

    notificationsPlaceholderViewModel.setAlphaForBrightnessMirror(contentAlpha)

    DisposableEffect(Unit) {

        onDispose { notificationsPlaceholderViewModel.setAlphaForBrightnessMirror(1f) }

    }



    BrightnessMirror(

        viewModel = brightnessMirrorViewModel,
@@ -420,7 +422,7 @@ private fun SceneScope.QuickSettingsScene( 
        )

        NotificationStackCutoffGuideline(

            stackScrollView = notificationStackScrollView,

            viewModel = viewModel.notifications,

            viewModel = notificationsPlaceholderViewModel,

            modifier =

                Modifier.align(Alignment.BottomCenter).navigationBarsPadding().offset {

                    IntOffset(x = 0, y = screenHeight.roundToInt())

packages/SystemUI/multivalentTests/src/com/android/systemui/qs/ui/viewmodel/QuickSettingsSceneViewModelTest.kt

+0 −2
Original line number Diff line number Diff line
@@ -51,7 +51,6 @@ import com.android.systemui.scene.shared.model.SceneFamilies 
import com.android.systemui.scene.shared.model.Scenes

import com.android.systemui.settings.brightness.ui.viewmodel.brightnessMirrorViewModelFactory

import com.android.systemui.shade.ui.viewmodel.shadeHeaderViewModelFactory

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

import com.android.systemui.testKosmos

import com.android.systemui.util.mockito.any

import com.android.systemui.util.mockito.mock
@@ -96,7 +95,6 @@ class QuickSettingsSceneViewModelTest : SysuiTestCase() { 
                brightnessMirrorViewModelFactory = kosmos.brightnessMirrorViewModelFactory,

                shadeHeaderViewModelFactory = kosmos.shadeHeaderViewModelFactory,

                qsSceneAdapter = qsFlexiglassAdapter,

                notifications = kosmos.notificationsPlaceholderViewModel,

                footerActionsViewModelFactory = footerActionsViewModelFactory,

                footerActionsController = footerActionsController,

                sceneBackInteractor = sceneBackInteractor,

packages/SystemUI/src/com/android/systemui/qs/ui/viewmodel/QuickSettingsSceneViewModel.kt

+0 −2
Original line number Diff line number Diff line
@@ -34,7 +34,6 @@ import com.android.systemui.scene.shared.model.SceneFamilies 
import com.android.systemui.scene.shared.model.Scenes

import com.android.systemui.settings.brightness.ui.viewModel.BrightnessMirrorViewModel

import com.android.systemui.shade.ui.viewmodel.ShadeHeaderViewModel

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

import java.util.concurrent.atomic.AtomicBoolean

import javax.inject.Inject

import kotlinx.coroutines.flow.Flow
@@ -51,7 +50,6 @@ constructor( 
    val brightnessMirrorViewModelFactory: BrightnessMirrorViewModel.Factory,

    val shadeHeaderViewModelFactory: ShadeHeaderViewModel.Factory,

    val qsSceneAdapter: QSSceneAdapter,

    val notifications: NotificationsPlaceholderViewModel,

    private val footerActionsViewModelFactory: FooterActionsViewModel.Factory,

    private val footerActionsController: FooterActionsController,

    sceneBackInteractor: SceneBackInteractor,