From 641e288cc2bc0a55729223f0bc9a8a2642c4dbde Mon Sep 17 00:00:00 2001
From: Fabian Kozynski <kozynski@google.com>
Date: Fri, 2 Jul 2021 12:45:09 -0400
Subject: [PATCH] Remove last row bottom padding in QS

The last row in QS should not have padding, as its followed by the
pagination row of the footer that has some padding (but the last one in QQS
should).

Bug: 189982925
Test: manual
Change-Id: I7b87539a14b9c6c4132cf9d8fee48e9bcc49a7e7
---
 .../SystemUI/src/com/android/systemui/qs/QuickQSPanel.java   | 1 +
 .../SystemUI/src/com/android/systemui/qs/TileLayout.java     | 5 +++++
 2 files changed, 6 insertions(+)

diff --git a/packages/SystemUI/src/com/android/systemui/qs/QuickQSPanel.java b/packages/SystemUI/src/com/android/systemui/qs/QuickQSPanel.java
index 68962b0cd17ad..4cd4048f72868 100644
--- a/packages/SystemUI/src/com/android/systemui/qs/QuickQSPanel.java
+++ b/packages/SystemUI/src/com/android/systemui/qs/QuickQSPanel.java
@@ -180,6 +180,7 @@ public class QuickQSPanel extends QSPanel {
                     LayoutParams.WRAP_CONTENT);
             setLayoutParams(lp);
             setMaxColumns(4);
+            mLastRowPadding = true;
         }
 
         @Override
diff --git a/packages/SystemUI/src/com/android/systemui/qs/TileLayout.java b/packages/SystemUI/src/com/android/systemui/qs/TileLayout.java
index 3e558a962427f..2b96a34967f49 100644
--- a/packages/SystemUI/src/com/android/systemui/qs/TileLayout.java
+++ b/packages/SystemUI/src/com/android/systemui/qs/TileLayout.java
@@ -31,6 +31,7 @@ public class TileLayout extends ViewGroup implements QSTileLayout {
     protected int mCellMarginVertical;
     protected int mSidePadding;
     protected int mRows = 1;
+    protected boolean mLastRowPadding = false;
 
     protected final ArrayList<TileRecord> mRecords = new ArrayList<>();
     protected boolean mListening;
@@ -167,6 +168,10 @@ public class TileLayout extends ViewGroup implements QSTileLayout {
         }
 
         int height = (mCellHeight + mCellMarginVertical) * mRows;
+        if (!mLastRowPadding) {
+            height -= mCellMarginVertical;
+        }
+
         if (height < 0) height = 0;
 
         setMeasuredDimension(width, height);