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

Commit 20fec853 authored by Rasheed Lewis's avatar Rasheed Lewis Committed by Automerger Merge Worker
Browse files

Merge "Fixed footer jump animation on QS Container" into udc-dev am: 4660d1a7 am: 6f0e6b7f

parents f0e6835d 6f0e6b7f
Loading
Loading
Loading
Loading
+1 −1
Original line number Original line Diff line number Diff line
@@ -218,7 +218,7 @@ class NotificationsQSContainerController @Inject constructor(
            containerPadding = 0
            containerPadding = 0
            stackScrollMargin = bottomStableInsets + notificationsBottomMargin
            stackScrollMargin = bottomStableInsets + notificationsBottomMargin
        }
        }
        val qsContainerPadding = if (!(isQSCustomizing || isQSDetailShowing)) {
        val qsContainerPadding = if (!isQSDetailShowing) {
            // We also want this padding in the bottom in these cases
            // We also want this padding in the bottom in these cases
            if (splitShadeEnabled) {
            if (splitShadeEnabled) {
                stackScrollMargin - scrimShadeBottomMargin - footerActionsOffset
                stackScrollMargin - scrimShadeBottomMargin - footerActionsOffset
+0 −19
Original line number Original line Diff line number Diff line
@@ -228,25 +228,6 @@ class NotificationQSContainerControllerTest : SysuiTestCase() {
                expectedQsPadding = STABLE_INSET_BOTTOM)
                expectedQsPadding = STABLE_INSET_BOTTOM)
    }
    }


    @Test
    fun testCustomizingInSinglePaneShade() {
        disableSplitShade()
        controller.setCustomizerShowing(true)

        // always sets spacings to 0
        given(taskbarVisible = false,
                navigationMode = GESTURES_NAVIGATION,
                insets = windowInsets().withStableBottom())
        then(expectedContainerPadding = 0,
                expectedNotificationsMargin = 0)

        given(taskbarVisible = false,
                navigationMode = BUTTONS_NAVIGATION,
                insets = emptyInsets())
        then(expectedContainerPadding = 0,
                expectedNotificationsMargin = 0)
    }

    @Test
    @Test
    fun testDetailShowingInSinglePaneShade() {
    fun testDetailShowingInSinglePaneShade() {
        disableSplitShade()
        disableSplitShade()