Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8a8be295 authored by Android Build Merger (Role)'s avatar Android Build Merger (Role) Committed by Android (Google) Code Review
Browse files

Merge "Merge "Remove allocation from HeaderTileLayout#onLayout" into qt-dev...

Merge "Merge "Remove allocation from HeaderTileLayout#onLayout" into qt-dev am: aeb929a3" into qt-dev-plus-aosp
parents dd57e9dc fb2a51de
Loading
Loading
Loading
Loading
+5 −4
Original line number Diff line number Diff line
@@ -181,6 +181,7 @@ public class QuickQSPanel extends QSPanel {
    private static class HeaderTileLayout extends TileLayout {

        private boolean mListening;
        private Rect mClippingBounds = new Rect();

        public HeaderTileLayout(Context context) {
            super(context);
@@ -219,8 +220,8 @@ public class QuickQSPanel extends QSPanel {
        @Override
        protected void onLayout(boolean changed, int l, int t, int r, int b) {
            // We only care about clipping on the right side
            Rect bounds = new Rect(0, 0, r - l, 10000);
            setClipBounds(bounds);
            mClippingBounds.set(0, 0, r - l, 10000);
            setClipBounds(mClippingBounds);

            calculateColumns();

@@ -252,9 +253,9 @@ public class QuickQSPanel extends QSPanel {
            }

            final int availableWidth = getMeasuredWidth() - getPaddingStart() - getPaddingEnd();
            final int leftoverWithespace = availableWidth - maxTiles * mCellWidth;
            final int leftoverWhitespace = availableWidth - maxTiles * mCellWidth;
            final int smallestHorizontalMarginNeeded;
            smallestHorizontalMarginNeeded = leftoverWithespace / Math.max(1, maxTiles - 1);
            smallestHorizontalMarginNeeded = leftoverWhitespace / Math.max(1, maxTiles - 1);

            if (smallestHorizontalMarginNeeded > 0){
                mCellMarginHorizontal = smallestHorizontalMarginNeeded;