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 
am: 7705d5fd6e

Change-Id: I9a478a5dd666c8c938206e888065dbec976a9e82
This commit is contained in:
Alan Viverette
2016-06-30 17:19:43 +00:00
committed by android-build-merger
parent 6b473f7b67 7705d5fd6e
commit 176f9cb656
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.