Merge "Remove last row bottom padding in QS" into sc-dev (49ed060f) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/qs/QuickQSPanel.java

+1 −0

Original line number	Diff line number	Diff line
		@@ -180,6 +180,7 @@ public class QuickQSPanel extends QSPanel {
		LayoutParams.WRAP_CONTENT);
		setLayoutParams(lp);
		setMaxColumns(4);
		mLastRowPadding = true;
		}

		@Override

+5 −0

Original line number	Diff line number	Diff line
		@@ -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);