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

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

Change-Id: Ifefcfc268631588192d7d03c109a9646572f8ba6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

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

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

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