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

Commit 1cf86deb authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Fix NSSL bottom margin with 3-button nav and no split shade" into tm-dev am: e2b71171 

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



Change-Id: I924ac57af32b7a81c398108ec90763722a13579a
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 55b531c7 e2b71171

packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationsQSContainerController.kt

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

            } else {

                containerPadding = 0

                stackScrollMargin = bottomStableInsets + notificationsBottomMargin

            }

        }

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

packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/NotificationQSContainerControllerTest.kt

+3 −1
Original line number Diff line number Diff line
@@ -206,7 +206,9 @@ class NotificationQSContainerControllerTest : SysuiTestCase() { 
        given(taskbarVisible = false,

                navigationMode = BUTTONS_NAVIGATION,

                insets = windowInsets().withStableBottom())

        then(expectedContainerPadding = 0, expectedQsPadding = STABLE_INSET_BOTTOM)

        then(expectedContainerPadding = 0,

                expectedNotificationsMargin = STABLE_INSET_BOTTOM + NOTIFICATIONS_MARGIN,

                expectedQsPadding = STABLE_INSET_BOTTOM)

    }



    @Test