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

Commit 6f0e6b7f 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 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23084182



Change-Id: Icddf05a857596e1813b23112fb623ac3f3432244
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 7f0e310a 4660d1a7

packages/SystemUI/src/com/android/systemui/shade/NotificationsQSContainerController.kt

+1 −1
Original line number Diff line number Diff line
@@ -218,7 +218,7 @@ class NotificationsQSContainerController @Inject constructor( 
            containerPadding = 0

            stackScrollMargin = bottomStableInsets + notificationsBottomMargin

        }

        val qsContainerPadding = if (!(isQSCustomizing || isQSDetailShowing)) {

        val qsContainerPadding = if (!isQSDetailShowing) {

            // We also want this padding in the bottom in these cases

            if (splitShadeEnabled) {

                stackScrollMargin - scrimShadeBottomMargin - footerActionsOffset

packages/SystemUI/tests/src/com/android/systemui/shade/NotificationQSContainerControllerTest.kt

+0 −19
Original line number Diff line number Diff line
@@ -228,25 +228,6 @@ class NotificationQSContainerControllerTest : SysuiTestCase() { 
                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

    fun testDetailShowingInSinglePaneShade() {

        disableSplitShade()