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

Merge "Avoid negative childSpecSize in RelativeLayout" into mnc-dev

Browse Source
This commit is contained in:
Alan Viverette
2015-06-25 00:09:05 +00:00
committed by Android (Google) Code Review
parent 91feb107f2 39310d3606
commit 10bf27e2c9
1 changed files with 10 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
core/java/android/widget/RelativeLayout.java
View File

@@ -763,19 +763,19 @@ public class RelativeLayout extends ViewGroup {
}
// Figure out maximum size available to this view
int maxAvailable = tempEnd - tempStart;
final int maxAvailable = tempEnd - tempStart;
if (childStart != VALUE_NOT_SET && childEnd != VALUE_NOT_SET) {
// Constraints fixed both edges, so child must be an exact size
// Constraints fixed both edges, so child must be an exact size.
childSpecMode = MeasureSpec.EXACTLY;
childSpecSize = maxAvailable;
childSpecSize = Math.max(0, maxAvailable);
} else {
if (childSize >= 0) {
// Child wanted an exact size. Give as much as possible
// Child wanted an exact size. Give as much as possible.
childSpecMode = MeasureSpec.EXACTLY;
if (maxAvailable >= 0) {
// We have a maxmum size in this dimension.
// We have a maximum size in this dimension.
childSpecSize = Math.min(maxAvailable, childSize);
} else {
// We can grow in this dimension.
@@ -783,20 +783,19 @@ public class RelativeLayout extends ViewGroup {
}
} else if (childSize == LayoutParams.MATCH_PARENT) {
// Child wanted to be as big as possible. Give all available
// space
// space.
childSpecMode = MeasureSpec.EXACTLY;
childSpecSize = maxAvailable;
childSpecSize = Math.max(0, maxAvailable);
} else if (childSize == LayoutParams.WRAP_CONTENT) {
// Child wants to wrap content. Use AT_MOST
// to communicate available space if we know
// our max size
// Child wants to wrap content. Use AT_MOST to communicate
// available space if we know our max size.
if (maxAvailable >= 0) {
// We have a maximum size in this dimension.
childSpecMode = MeasureSpec.AT_MOST;
childSpecSize = maxAvailable;
} else {
// We can grow in this dimension. Child can be as big as it
// wants
// wants.
childSpecMode = MeasureSpec.UNSPECIFIED;
childSpecSize = 0;
}