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

Commit 9f305dce authored by Shawn Lee's avatar Shawn Lee
Browse files

[flexiglass] Hook up notification scrim to Shade's empty click handling 

Bug: 347332836
Test: Manually verified empty click behavior
Flag: com.android.systemui.scene_container
Change-Id: Ie3a2e31346a0f5a210994b9c8c703f37ba81b3e2
parent c78176d9

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

+6 −0
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ import android.util.Log 
import androidx.compose.animation.core.Animatable

import androidx.compose.foundation.ScrollState

import androidx.compose.foundation.background

import androidx.compose.foundation.clickable

import androidx.compose.foundation.gestures.scrollBy

import androidx.compose.foundation.layout.Box

import androidx.compose.foundation.layout.Spacer
@@ -233,6 +234,8 @@ fun SceneScope.NotificationScrollingStack( 
    // The height of the scrim visible on screen when it is in its resting (collapsed) state.

    val minVisibleScrimHeight: () -> Float = { screenHeight - maxScrimTop() }



    val isClickable by viewModel.isClickable.collectAsStateWithLifecycle()



    // we are not scrolled to the top unless the scrim is at its maximum offset.

    LaunchedEffect(viewModel, scrimOffset) {

        snapshotFlow { scrimOffset.value >= 0f }
@@ -328,6 +331,9 @@ fun SceneScope.NotificationScrollingStack( 
                        )

                    )

                }

                .thenIf(isClickable) {

                    Modifier.clickable(onClick = { viewModel.onEmptySpaceClicked() })

                }

    ) {

        // Creates a cutout in the background scrim in the shape of the notifications scrim.

        // Only visible when notif scrim alpha < 1, during shade expansion.

packages/SystemUI/compose/features/src/com/android/systemui/shade/ui/composable/ShadeScene.kt

+16 −6
Original line number Diff line number Diff line
@@ -97,6 +97,7 @@ import com.android.systemui.scene.ui.composable.ComposableScene 
import com.android.systemui.shade.shared.model.ShadeMode

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

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

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

import com.android.systemui.statusbar.phone.StatusBarLocation

import com.android.systemui.statusbar.phone.ui.StatusBarIconController

import com.android.systemui.statusbar.phone.ui.TintedIconManager
@@ -138,6 +139,7 @@ constructor( 
    private val shadeSession: SaveableSession,

    private val notificationStackScrollView: Lazy<NotificationScrollView>,

    private val viewModel: ShadeSceneViewModel,

    private val notificationsPlaceholderViewModel: NotificationsPlaceholderViewModel,

    private val tintedIconManagerFactory: TintedIconManager.Factory,

    private val batteryMeterViewControllerFactory: BatteryMeterViewController.Factory,

    private val statusBarIconController: StatusBarIconController,
@@ -157,6 +159,7 @@ constructor( 
        ShadeScene(

            notificationStackScrollView.get(),

            viewModel = viewModel,

            notificationsPlaceholderViewModel = notificationsPlaceholderViewModel,

            createTintedIconManager = tintedIconManagerFactory::create,

            createBatteryMeterViewController = batteryMeterViewControllerFactory::create,

            statusBarIconController = statusBarIconController,
@@ -177,6 +180,7 @@ constructor( 
private fun SceneScope.ShadeScene(

    notificationStackScrollView: NotificationScrollView,

    viewModel: ShadeSceneViewModel,

    notificationsPlaceholderViewModel: NotificationsPlaceholderViewModel,

    createTintedIconManager: (ViewGroup, StatusBarLocation) -> TintedIconManager,

    createBatteryMeterViewController: (ViewGroup, StatusBarLocation) -> BatteryMeterViewController,

    statusBarIconController: StatusBarIconController,
@@ -191,6 +195,7 @@ private fun SceneScope.ShadeScene( 
            SingleShade(

                notificationStackScrollView = notificationStackScrollView,

                viewModel = viewModel,

                notificationsPlaceholderViewModel = notificationsPlaceholderViewModel,

                createTintedIconManager = createTintedIconManager,

                createBatteryMeterViewController = createBatteryMeterViewController,

                statusBarIconController = statusBarIconController,
@@ -203,6 +208,7 @@ private fun SceneScope.ShadeScene( 
            SplitShade(

                notificationStackScrollView = notificationStackScrollView,

                viewModel = viewModel,

                notificationsPlaceholderViewModel = notificationsPlaceholderViewModel,

                createTintedIconManager = createTintedIconManager,

                createBatteryMeterViewController = createBatteryMeterViewController,

                statusBarIconController = statusBarIconController,
@@ -219,6 +225,7 @@ private fun SceneScope.ShadeScene( 
private fun SceneScope.SingleShade(

    notificationStackScrollView: NotificationScrollView,

    viewModel: ShadeSceneViewModel,

    notificationsPlaceholderViewModel: NotificationsPlaceholderViewModel,

    createTintedIconManager: (ViewGroup, StatusBarLocation) -> TintedIconManager,

    createBatteryMeterViewController: (ViewGroup, StatusBarLocation) -> BatteryMeterViewController,

    statusBarIconController: StatusBarIconController,
@@ -330,7 +337,7 @@ private fun SceneScope.SingleShade( 
                        NotificationScrollingStack(

                            shadeSession = shadeSession,

                            stackScrollView = notificationStackScrollView,

                            viewModel = viewModel.notifications,

                            viewModel = notificationsPlaceholderViewModel,

                            maxScrimTop = { maxNotifScrimTop.value },

                            shadeMode = ShadeMode.Single,

                            shouldPunchHoleBehindScrim = shouldPunchHoleBehindScrim,
@@ -354,7 +361,7 @@ private fun SceneScope.SingleShade( 
        }

        NotificationStackCutoffGuideline(

            stackScrollView = notificationStackScrollView,

            viewModel = viewModel.notifications,

            viewModel = notificationsPlaceholderViewModel,

            modifier = Modifier.align(Alignment.BottomCenter).navigationBarsPadding()

        )

    }
@@ -364,6 +371,7 @@ private fun SceneScope.SingleShade( 
private fun SceneScope.SplitShade(

    notificationStackScrollView: NotificationScrollView,

    viewModel: ShadeSceneViewModel,

    notificationsPlaceholderViewModel: NotificationsPlaceholderViewModel,

    createTintedIconManager: (ViewGroup, StatusBarLocation) -> TintedIconManager,

    createBatteryMeterViewController: (ViewGroup, StatusBarLocation) -> BatteryMeterViewController,

    statusBarIconController: StatusBarIconController,
@@ -431,8 +439,10 @@ private fun SceneScope.SplitShade( 
            label = "alphaAnimationBrightnessMirrorContentHiding",

        )



    viewModel.notifications.setAlphaForBrightnessMirror(contentAlpha)

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

    notificationsPlaceholderViewModel.setAlphaForBrightnessMirror(contentAlpha)

    DisposableEffect(Unit) {

        onDispose { notificationsPlaceholderViewModel.setAlphaForBrightnessMirror(1f) }

    }



    val isMediaVisible by viewModel.isMediaVisible.collectAsStateWithLifecycle()
@@ -533,7 +543,7 @@ private fun SceneScope.SplitShade( 
                NotificationScrollingStack(

                    shadeSession = shadeSession,

                    stackScrollView = notificationStackScrollView,

                    viewModel = viewModel.notifications,

                    viewModel = notificationsPlaceholderViewModel,

                    maxScrimTop = { 0f },

                    shouldPunchHoleBehindScrim = false,

                    shouldReserveSpaceForNavBar = false,
@@ -548,7 +558,7 @@ private fun SceneScope.SplitShade( 
        }

        NotificationStackCutoffGuideline(

            stackScrollView = notificationStackScrollView,

            viewModel = viewModel.notifications,

            viewModel = notificationsPlaceholderViewModel,

            modifier = Modifier.align(Alignment.BottomCenter).navigationBarsPadding()

        )

    }

packages/SystemUI/multivalentTests/src/com/android/systemui/keyguard/ui/viewmodel/LockscreenSceneViewModelTest.kt

+2 −0
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ 
package com.android.systemui.keyguard.ui.viewmodel



import android.platform.test.annotations.EnableFlags

import android.testing.TestableLooper.RunWithLooper

import androidx.test.filters.SmallTest

import com.android.compose.animation.scene.Edge

import com.android.compose.animation.scene.SceneKey
@@ -61,6 +62,7 @@ import platform.test.runner.parameterized.Parameters 


@SmallTest

@RunWith(ParameterizedAndroidJunit4::class)

@RunWithLooper

@EnableSceneContainer

class LockscreenSceneViewModelTest : SysuiTestCase() {

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

+2 −0
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 


package com.android.systemui.qs.ui.viewmodel



import android.testing.TestableLooper.RunWithLooper

import androidx.test.ext.junit.runners.AndroidJUnit4

import androidx.test.filters.SmallTest

import com.android.compose.animation.scene.Back
@@ -64,6 +65,7 @@ import org.mockito.Mockito.verify 


@SmallTest

@RunWith(AndroidJUnit4::class)

@RunWithLooper

@EnableSceneContainer

class QuickSettingsSceneViewModelTest : SysuiTestCase() {

packages/SystemUI/multivalentTests/src/com/android/systemui/scene/SceneFrameworkIntegrationTest.kt

+4 −22
Original line number Diff line number Diff line
@@ -51,13 +51,10 @@ import com.android.systemui.flags.fakeFeatureFlagsClassic 
import com.android.systemui.keyguard.ui.viewmodel.KeyguardLongPressViewModel

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

import com.android.systemui.kosmos.testScope

import com.android.systemui.media.controls.domain.pipeline.interactor.mediaCarouselInteractor

import com.android.systemui.power.domain.interactor.PowerInteractor.Companion.setAsleepForTest

import com.android.systemui.power.domain.interactor.PowerInteractor.Companion.setAwakeForTest

import com.android.systemui.power.domain.interactor.powerInteractor

import com.android.systemui.qs.footerActionsController

import com.android.systemui.qs.footerActionsViewModelFactory

import com.android.systemui.qs.ui.adapter.FakeQSSceneAdapter

import com.android.systemui.qs.ui.adapter.fakeQSSceneAdapter

import com.android.systemui.scene.domain.interactor.sceneInteractor

import com.android.systemui.scene.domain.resolver.homeSceneFamilyResolver

import com.android.systemui.scene.domain.startable.sceneContainerStartable
@@ -65,16 +62,14 @@ import com.android.systemui.scene.shared.model.SceneFamilies 
import com.android.systemui.scene.shared.model.Scenes

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

import com.android.systemui.scene.ui.viewmodel.SceneContainerViewModel

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

import com.android.systemui.shade.domain.interactor.shadeInteractor

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

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

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

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

import com.android.systemui.statusbar.pipeline.mobile.data.repository.FakeMobileConnectionsRepository

import com.android.systemui.statusbar.pipeline.mobile.data.repository.fakeMobileConnectionsRepository

import com.android.systemui.telephony.data.repository.fakeTelephonyRepository

import com.android.systemui.testKosmos

import com.android.systemui.unfold.domain.interactor.unfoldTransitionInteractor

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

import com.android.systemui.util.mockito.mock

import com.android.systemui.util.mockito.whenever
@@ -167,7 +162,7 @@ class SceneFrameworkIntegrationTest : SysuiTestCase() { 


    private var bouncerSceneJob: Job? = null



    private val qsFlexiglassAdapter = FakeQSSceneAdapter(inflateDelegate = { mock() })

    private val qsFlexiglassAdapter = kosmos.fakeQSSceneAdapter



    private lateinit var emergencyAffordanceManager: EmergencyAffordanceManager

    private lateinit var telecomManager: TelecomManager
@@ -200,20 +195,7 @@ class SceneFrameworkIntegrationTest : SysuiTestCase() { 
        bouncerActionButtonInteractor = kosmos.bouncerActionButtonInteractor

        bouncerViewModel = kosmos.bouncerViewModel



        shadeSceneViewModel =

            ShadeSceneViewModel(

                applicationScope = testScope.backgroundScope,

                shadeHeaderViewModel = kosmos.shadeHeaderViewModel,

                qsSceneAdapter = qsFlexiglassAdapter,

                notifications = kosmos.notificationsPlaceholderViewModel,

                brightnessMirrorViewModel = kosmos.brightnessMirrorViewModel,

                mediaCarouselInteractor = kosmos.mediaCarouselInteractor,

                shadeInteractor = kosmos.shadeInteractor,

                footerActionsController = kosmos.footerActionsController,

                footerActionsViewModelFactory = kosmos.footerActionsViewModelFactory,

                sceneInteractor = sceneInteractor,

                unfoldTransitionInteractor = kosmos.unfoldTransitionInteractor,

            )

        shadeSceneViewModel = kosmos.shadeSceneViewModel



        val startable = kosmos.sceneContainerStartable

        startable.start()