Merge "Correctly check bottom padding in setPadding()."

This commit is contained in:
Romain Guy
2011-03-24 12:04:20 -07:00
committed by Android (Google) Code Review

View File

@@ -1975,7 +1975,7 @@ public abstract class ViewGroup extends View implements ViewParent, ViewManager
public void setPadding(int left, int top, int right, int bottom) {
super.setPadding(left, top, right, bottom);
if ((mPaddingLeft | mPaddingTop | mPaddingRight | mPaddingRight) != 0) {
if ((mPaddingLeft | mPaddingTop | mPaddingRight | mPaddingBottom) != 0) {
mGroupFlags |= FLAG_PADDING_NOT_NULL;
} else {
mGroupFlags &= ~FLAG_PADDING_NOT_NULL;