Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

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

Change-Id: I924ac57af32b7a81c398108ec90763722a13579a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
TreeHugger Robot
2022-06-10 16:29:08 +00:00
committed by Automerger Merge Worker
parent 55b531c74a e2b711716d
commit 1cf86deb40
2 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -200,6 +200,7 @@ class NotificationsQSContainerController @Inject constructor(
containerPadding = bottomStableInsets containerPadding = bottomStableInsets
} else { } else {
containerPadding = 0 containerPadding = 0
stackScrollMargin = bottomStableInsets + notificationsBottomMargin
} }
} }
val qsContainerPadding = if (!(isQSCustomizing || isQSDetailShowing)) { val qsContainerPadding = if (!(isQSCustomizing || isQSDetailShowing)) {

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

@@ -206,7 +206,9 @@ class NotificationQSContainerControllerTest : SysuiTestCase() {
given(taskbarVisible = false, given(taskbarVisible = false,
navigationMode = BUTTONS_NAVIGATION, navigationMode = BUTTONS_NAVIGATION,
insets = windowInsets().withStableBottom()) insets = windowInsets().withStableBottom())
then(expectedContainerPadding = 0, expectedQsPadding = STABLE_INSET_BOTTOM) then(expectedContainerPadding = 0,
expectedNotificationsMargin = STABLE_INSET_BOTTOM + NOTIFICATIONS_MARGIN,
expectedQsPadding = STABLE_INSET_BOTTOM)
} }
@Test @Test