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

Commit 964a749d authored by Alejandro Nijamkin's avatar Alejandro Nijamkin
Browse files

[flexiglass] Moves NSSL an additional px down in QS scene 

This fixes the swipe up from the bottom edge that collapses QS back to
gone or lockscreen so that it works again (instead of scrolling NSSL
up).

Bug: 370877754
Test: manually verified that dragging up from the bottom of the display
while on QS correctly closes back to LS or Gone scene
Flag: com.android.systemui.scene_container

Change-Id: I797a476f78df5260c8bd3e5abd685caff7b71d42
parent 686efe65

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

+12 −3
Original line number Diff line number Diff line
@@ -420,17 +420,26 @@ private fun SceneScope.QuickSettingsScene( 
                    .navigationBarsPadding()

                    .padding(horizontal = shadeHorizontalPadding),

        )



        // The minimum possible value for the top of the notification stack. In other words: how

        // high is the notification stack allowed to get when the scene is at rest. It may still be

        // translated farther upwards by a transition animation but, at rest, the top edge of its

        // bounds must be limited to be at or below this value.

        //

        // A 1 pixel is added to compensate for any kind of rounding errors to make sure 100% that

        // the notification stack is entirely "below" the entire screen.

        val minNotificationStackTop = screenHeight.roundToInt() + 1

        NotificationScrollingStack(

            shadeSession = shadeSession,

            stackScrollView = notificationStackScrollView,

            viewModel = notificationsPlaceholderViewModel,

            maxScrimTop = { screenHeight },

            maxScrimTop = { minNotificationStackTop.toFloat() },

            shouldPunchHoleBehindScrim = shouldPunchHoleBehindScrim,

            shouldIncludeHeadsUpSpace = false,

            shadeMode = ShadeMode.Single,

            modifier =

                Modifier.fillMaxWidth()

                    .offset { IntOffset(x = 0, y = screenHeight.roundToInt()) }

                    .offset { IntOffset(x = 0, y = minNotificationStackTop) }

                    .padding(horizontal = shadeHorizontalPadding),

        )

        NotificationStackCutoffGuideline(
@@ -439,7 +448,7 @@ private fun SceneScope.QuickSettingsScene( 
            modifier =

                Modifier.align(Alignment.BottomCenter)

                    .navigationBarsPadding()

                    .offset { IntOffset(x = 0, y = screenHeight.roundToInt()) }

                    .offset { IntOffset(x = 0, y = minNotificationStackTop) }

                    .padding(horizontal = shadeHorizontalPadding),

        )

    }