Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix measurement of list with single item" into pi-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2018-04-13 02:09:27 +00:00
committed by Android (Google) Code Review
parent f2b624c140 fc7036cb21
commit beefded4c7
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
core/java/com/android/internal/widget/NotificationActionListLayout.java
View File

@@ -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;