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

Commit a48576b6 authored by burakov's avatar burakov
Browse files

[bc25] Notifications should not reserve space for nav bar in Dual Shade. 

Test: Manually tested by opening and closing the notifications shade on
a foldable device both in a folded and unfolded configuration.
Test: Unit tests build and pass.
Bug: 338009491
Flag: com.android.systemui.dual_shade

Change-Id: I1507c88dbeaa8074ab9866561fa6a0e03dccad36
parent f22d310d

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

+2 −1
Original line number Diff line number Diff line
@@ -170,6 +170,7 @@ fun SceneScope.NotificationScrollingStack( 
    maxScrimTop: () -> Float,

    shouldPunchHoleBehindScrim: Boolean,

    shouldFillMaxSize: Boolean = true,

    shouldReserveSpaceForNavBar: Boolean = true,

    shadeMode: ShadeMode,

    modifier: Modifier = Modifier,

) {
@@ -353,7 +354,7 @@ fun SceneScope.NotificationScrollingStack( 
                        .fillMaxWidth()

                        .notificationStackHeight(

                            view = stackScrollView,

                            padding = navBarHeight.toInt()

                            padding = if (shouldReserveSpaceForNavBar) navBarHeight.toInt() else 0

                        )

                        .onSizeChanged { size -> stackHeight.intValue = size.height },

            )

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

+1 −0
Original line number Diff line number Diff line
@@ -94,6 +94,7 @@ constructor( 
                    maxScrimTop = { 0f },

                    shouldPunchHoleBehindScrim = false,

                    shouldFillMaxSize = false,

                    shouldReserveSpaceForNavBar = false,

                    shadeMode = ShadeMode.Dual,

                    modifier = Modifier.fillMaxWidth(),

                )