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

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

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

Change-Id: Icddf05a857596e1813b23112fb623ac3f3432244
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Rasheed Lewis
2023-05-16 14:54:33 +00:00
committed by Automerger Merge Worker
parent 7f0e310a74 4660d1a788
commit 6f0e6b7f67
2 changed files with 1 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packages/SystemUI/src/com/android/systemui/shade/NotificationsQSContainerController.kt
View File

@@ -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

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

@@ -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()