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

Commit fc7036cb authored by Lucas Dupin's avatar Lucas Dupin
Browse files

Fix measurement of list with single item 

Change-Id: I2474410b7374155bbbe5de0c757e9017f52746e5
Fixes: 72656378
Test: visual
parent fcbbb726

core/java/com/android/internal/widget/NotificationActionListLayout.java

+6 −4
Original line number Diff line number Diff line
@@ -107,21 +107,23 @@ public class NotificationActionListLayout extends LinearLayout { 
                }

            }

        }

        if (notGoneChildren > 1 && needRebuild) {

        boolean centerAligned = (mGravity & Gravity.CENTER_HORIZONTAL) != 0;

        boolean singleChildCentered = notGoneChildren == 1 && centerAligned;

        boolean needsRegularMeasurement = notGoneChildren > 1 || singleChildCentered;



        if (needsRegularMeasurement && needRebuild) {

            rebuildMeasureOrder(textViews, otherViews);

        }



        final boolean constrained =

                MeasureSpec.getMode(widthMeasureSpec) != MeasureSpec.UNSPECIFIED;

        final boolean centerAligned = (mGravity & Gravity.CENTER_HORIZONTAL) != 0;



        final int innerWidth = MeasureSpec.getSize(widthMeasureSpec) - mPaddingLeft - mPaddingRight;

        final int otherSize = mMeasureOrderOther.size();

        int usedWidth = 0;



        // Optimization: Don't do this if there's only one child.

        int measuredChildren = 0;

        for (int i = 0; i < N && notGoneChildren > 1; i++) {

        for (int i = 0; i < N && needsRegularMeasurement; i++) {

            // Measure shortest children first. To avoid measuring twice, we approximate by looking

            // at the text length.

            View c;