From 15b9c75fea77eabf8bbe3d5b1ef8985b2d5c80cd Mon Sep 17 00:00:00 2001
From: Rasheed Lewis <rasheedlewis@google.com>
Date: Mon, 8 May 2023 02:14:32 +0000
Subject: [PATCH] Fixed footer jump animation on QS Container

This bug was caused by a conditional check where the bottom padding of
the footer icons is set to 0 when in QS Edit mode.

Fixes: 233290729
Test: atest NotificationQSContainerControllerTest
Change-Id: I1c7bdc5939d6f15749b6eed268a0bc8035a4eea0
---
 .../NotificationsQSContainerController.kt     |  2 +-
 .../NotificationQSContainerControllerTest.kt  | 19 -------------------
 2 files changed, 1 insertion(+), 20 deletions(-)

diff --git a/packages/SystemUI/src/com/android/systemui/shade/NotificationsQSContainerController.kt b/packages/SystemUI/src/com/android/systemui/shade/NotificationsQSContainerController.kt
index fb7c5c2e31faa..ad82a62c84e75 100644
--- a/packages/SystemUI/src/com/android/systemui/shade/NotificationsQSContainerController.kt
+++ b/packages/SystemUI/src/com/android/systemui/shade/NotificationsQSContainerController.kt
@@ -216,7 +216,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
diff --git a/packages/SystemUI/tests/src/com/android/systemui/shade/NotificationQSContainerControllerTest.kt b/packages/SystemUI/tests/src/com/android/systemui/shade/NotificationQSContainerControllerTest.kt
index dfb1bce20ff82..168cbb7b8da3f 100644
--- a/packages/SystemUI/tests/src/com/android/systemui/shade/NotificationQSContainerControllerTest.kt
+++ b/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()