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

Commit 8f4f2a9b authored by Selim Cinek's avatar Selim Cinek Committed by Android (Google) Code Review
Browse files

Merge "Fixed a crash where the overflow number wasn't initialized" into nyc-dev

parents 1689203d b41b2f6f

packages/SystemUI/src/com/android/systemui/statusbar/ExpandableNotificationRow.java

+4 −0
Original line number Diff line number Diff line
@@ -277,6 +277,10 @@ public class ExpandableNotificationRow extends ActivatableNotificationView { 
        int intrinsicBefore = getIntrinsicHeight();

        mIsHeadsUp = isHeadsUp;

        mPrivateLayout.setHeadsUp(isHeadsUp);

        if (mIsSummaryWithChildren) {

            // The overflow might change since we allow more lines as HUN.

            mChildrenContainer.updateGroupOverflow();

        }

        if (intrinsicBefore != getIntrinsicHeight()) {

            notifyHeightChanged(false  /* needsAnimation */);

        }

packages/SystemUI/src/com/android/systemui/statusbar/stack/NotificationChildrenContainer.java

+3 −1
Original line number Diff line number Diff line
@@ -139,7 +139,9 @@ public class NotificationChildrenContainer extends ViewGroup { 
        for (int i = 0; i < childCount; i++) {

            ExpandableNotificationRow child = mChildren.get(i);

            boolean isOverflow = i == overflowIndex;

            child.setSingleLineWidthIndention(isOverflow ? mOverflowNumber.getMeasuredWidth() : 0);

            child.setSingleLineWidthIndention(isOverflow && mOverflowNumber != null

                    ? mOverflowNumber.getMeasuredWidth()

                    : 0);

            child.measure(widthMeasureSpec, newHeightSpec);

            height += child.getMeasuredHeight();