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

Merge "Exclude children from excess space distribution when using largest child" into nyc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2016-06-30 17:07:06 +00:00
committed by Android (Google) Code Review
parent bb07b0b372 070b22bdee
commit 7705d5fd6e
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
core/java/android/widget/LinearLayout.java
View File

@@ -890,7 +890,9 @@ public class LinearLayout extends ViewGroup {
remainingWeightSum -= childWeight; remainingWeightSum -= childWeight;
final int childHeight; final int childHeight;
if (lp.height == 0 && (!mAllowInconsistentMeasurement if (mUseLargestChild && heightMode != MeasureSpec.EXACTLY) {
childHeight = largestChildHeight;
} else if (lp.height == 0 && (!mAllowInconsistentMeasurement
|| heightMode == MeasureSpec.EXACTLY)) { || heightMode == MeasureSpec.EXACTLY)) {
// This child needs to be laid out from scratch using // This child needs to be laid out from scratch using
// only its share of excess space. // only its share of excess space.
@@ -1272,7 +1274,9 @@ public class LinearLayout extends ViewGroup {
remainingWeightSum -= childWeight; remainingWeightSum -= childWeight;
final int childWidth; final int childWidth;
if (lp.width == 0 && (!mAllowInconsistentMeasurement if (mUseLargestChild && widthMode != MeasureSpec.EXACTLY) {
childWidth = largestChildWidth;
} else if (lp.width == 0 && (!mAllowInconsistentMeasurement
|| widthMode == MeasureSpec.EXACTLY)) { || widthMode == MeasureSpec.EXACTLY)) {
// This child needs to be laid out from scratch using // This child needs to be laid out from scratch using
// only its share of excess space. // only its share of excess space.