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

Commit 5e419d82 authored by Jeff DeCew's avatar Jeff DeCew Committed by Android (Google) Code Review
Browse files

Merge changes Id61f2c0d,Ib5f2151d,I8b7c50f9 into main 

* changes:
  [flexiglass] Make SharedNotificationContainerBinder an injectable instance
  [flexiglass] Make NotificationStackViewBinder an injectable instance
  [flexiglass] Fix notification scrim rounding in split shade
parents 3d82ce69 c814aace

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

+5 −28
Original line number Diff line number Diff line
@@ -16,45 +16,33 @@ 


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

import kotlinx.coroutines.CoroutineDispatcher



@SysUISingleton

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,

    @Main private val mainImmediateDispatcher: CoroutineDispatcher,

    sharedNotificationContainerBinder: SharedNotificationContainerBinder,

    notificationStackViewBinder: NotificationStackViewBinder,

) {



    init {
@@ -73,24 +61,13 @@ constructor( 
            sharedNotificationContainer.addNotificationStackScrollLayout(stackScrollLayout)

        }



        SharedNotificationContainerBinder.bind(

        sharedNotificationContainerBinder.bind(

            sharedNotificationContainer,

            sharedNotificationContainerViewModel,

            sceneContainerFlags,

            controller,

            notificationStackSizeCalculator,

            mainImmediateDispatcher = mainImmediateDispatcher,

        )



        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

+8 −4
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)
@@ -157,7 +159,7 @@ fun SceneScope.NotificationScrollingStack( 


    val contentHeight = viewModel.intrinsicContentHeight.collectAsState()



    val stackRounding = viewModel.stackRounding.collectAsState()

    val stackRounding = viewModel.stackRounding.collectAsState(StackRounding())



    // the offset for the notifications scrim. Its upper bound is 0, and its lower bound is

    // calculated in minScrimOffset. The scrim is the same height as the screen minus the
@@ -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/compose/features/src/com/android/systemui/shade/ui/composable/ShadeScene.kt

+2 −1
Original line number Diff line number Diff line
@@ -370,7 +370,8 @@ private fun SceneScope.SplitShade( 
                NotificationScrollingStack(

                    viewModel = viewModel.notifications,

                    maxScrimTop = { 0f },

                    modifier = Modifier.weight(1f).fillMaxHeight(),

                    modifier =

                        Modifier.weight(1f).fillMaxHeight().padding(bottom = navBarBottomHeight),

                )

            }

        }

packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/notification/stack/domain/interactor/NotificationStackAppearanceInteractorTest.kt

+17 −3
Original line number Diff line number Diff line
@@ -20,9 +20,12 @@ import androidx.test.ext.junit.runners.AndroidJUnit4 
import androidx.test.filters.SmallTest

import com.android.systemui.SysuiTestCase

import com.android.systemui.coroutines.collectLastValue

import com.android.systemui.kosmos.Kosmos

import com.android.systemui.kosmos.testScope

import com.android.systemui.shade.data.repository.shadeRepository

import com.android.systemui.shade.shared.model.ShadeMode

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

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

import com.android.systemui.testKosmos

import com.google.common.truth.Truth.assertThat

import kotlinx.coroutines.test.runTest

import org.junit.Test
@@ -30,10 +33,9 @@ import org.junit.runner.RunWith 


@SmallTest

@RunWith(AndroidJUnit4::class)

@android.platform.test.annotations.EnabledOnRavenwood

class NotificationStackAppearanceInteractorTest : SysuiTestCase() {



    private val kosmos = Kosmos()

    private val kosmos = testKosmos()

    private val testScope = kosmos.testScope

    private val underTest = kosmos.notificationStackAppearanceInteractor
@@ -59,6 +61,18 @@ class NotificationStackAppearanceInteractorTest : SysuiTestCase() { 
            assertThat(stackBounds).isEqualTo(bounds2)

        }



    @Test

    fun stackRounding() =

        testScope.runTest {

            val stackRounding by collectLastValue(underTest.stackRounding)



            kosmos.shadeRepository.setShadeMode(ShadeMode.Single)

            assertThat(stackRounding).isEqualTo(StackRounding(roundTop = true, roundBottom = false))



            kosmos.shadeRepository.setShadeMode(ShadeMode.Split)

            assertThat(stackRounding).isEqualTo(StackRounding(roundTop = true, roundBottom = true))

        }



    @Test(expected = IllegalStateException::class)

    fun setStackBounds_withImproperBounds_throwsException() =

        testScope.runTest {

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.

     *