diff options
| author | Romain Guy <romainguy@google.com> | 2011-03-24 12:04:20 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-03-24 12:04:20 -0700 |
| commit | cf38b0cea6dbb58e60a600d09de2d7fa0aa1ee97 (patch) | |
| tree | 1063d73c83208666433adbbaaa3d1c4d654cbaab /core/java | |
| parent | 46709f13c7079052c68e745916d0d0ffdfb20673 (diff) | |
| parent | 13f35f3ce6a7d26c20d1c63485bfb5e2ffff31b9 (diff) | |
Merge "Correctly check bottom padding in setPadding()."
Diffstat (limited to 'core/java')
| -rw-r--r-- | core/java/android/view/ViewGroup.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/java/android/view/ViewGroup.java b/core/java/android/view/ViewGroup.java index 8dc86ac63dc6..679ddfa5fc81 100644 --- a/core/java/android/view/ViewGroup.java +++ b/core/java/android/view/ViewGroup.java @@ -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; |