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

Merge "Fix LinearLayout measureWithLargestChild for wrap_content views" into jb-dev

Browse Source
This commit is contained in:
Adam Powell
2012-05-04 15:01:14 -07:00
committed by Android (Google) Code Review
parent b709528407 eabc919844
commit 9c98234095
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -867,7 +867,7 @@ public class LinearLayout extends ViewGroup {
// We have no limit, so make all weighted views as tall as the largest child.
// Children will have already been measured once.
if (useLargestChild && widthMode == MeasureSpec.UNSPECIFIED) {
if (useLargestChild && heightMode != MeasureSpec.EXACTLY) {
for (int i = 0; i < count; i++) {
final View child = getVirtualChildAt(i);
@@ -1283,7 +1283,7 @@ public class LinearLayout extends ViewGroup {
// We have no limit, so make all weighted views as wide as the largest child.
// Children will have already been measured once.
if (useLargestChild && widthMode == MeasureSpec.UNSPECIFIED) {
if (useLargestChild && widthMode != MeasureSpec.EXACTLY) {
for (int i = 0; i < count; i++) {
final View child = getVirtualChildAt(i);