Merge "Fixed footer jump animation on QS Container" into udc-dev (4660d1a7) · Commits · e / os / android_frameworks_base

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

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