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

Merge "Check RelativeLayout's access of its own LayoutParams during measurement" into klp-dev

Browse Source
This commit is contained in:
Adam Powell
2013-09-14 00:23:07 +00:00
committed by Android (Google) Code Review
parent 76adfd71f1 758d5a4563
commit 50e5814c33
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/RelativeLayout.java
View File

@@ -536,7 +536,7 @@ public class RelativeLayout extends ViewGroup {
// the right of each child view // the right of each child view
width += mPaddingRight; width += mPaddingRight;
if (mLayoutParams.width >= 0) { if (mLayoutParams != null && mLayoutParams.width >= 0) {
width = Math.max(width, mLayoutParams.width); width = Math.max(width, mLayoutParams.width);
} }
@@ -566,7 +566,7 @@ public class RelativeLayout extends ViewGroup {
// the bottom of each child view // the bottom of each child view
height += mPaddingBottom; height += mPaddingBottom;
if (mLayoutParams.height >= 0) { if (mLayoutParams != null && mLayoutParams.height >= 0) {
height = Math.max(height, mLayoutParams.height); height = Math.max(height, mLayoutParams.height);
} }