diff options
| author | Fabrice Di Meglio <fdimeglio@google.com> | 2011-07-18 14:26:45 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-07-18 14:26:45 -0700 |
| commit | 989571eeca547db5f8972560c2d45f00be92a327 (patch) | |
| tree | 25709cb4e09a7134f58711177547f69480ed7e53 /core/java | |
| parent | 46c72507984f32c8b5c86721086b624d73ae859a (diff) | |
| parent | f3e1a936c3d10fb13c3b1006cfc91dd4a224dc26 (diff) | |
| download | frameworks_base-989571eeca547db5f8972560c2d45f00be92a327.zip frameworks_base-989571eeca547db5f8972560c2d45f00be92a327.tar.gz frameworks_base-989571eeca547db5f8972560c2d45f00be92a327.tar.bz2 | |
Merge "Fix resolution padding glitch"
Diffstat (limited to 'core/java')
| -rw-r--r-- | core/java/android/view/View.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/core/java/android/view/View.java b/core/java/android/view/View.java index 41b9e2d..4385c2f 100644 --- a/core/java/android/view/View.java +++ b/core/java/android/view/View.java @@ -9127,12 +9127,12 @@ public class View implements Drawable.Callback2, KeyEvent.Callback, Accessibilit // Start user padding override Left user padding. Otherwise, if Left user // padding is not defined, use the default left padding. If Left user padding // is defined, just use it. - if (mUserPaddingStart > 0) { + if (mUserPaddingStart >= 0) { mUserPaddingLeft = mUserPaddingStart; } else if (mUserPaddingLeft < 0) { mUserPaddingLeft = mPaddingLeft; } - if (mUserPaddingEnd > 0) { + if (mUserPaddingEnd >= 0) { mUserPaddingRight = mUserPaddingEnd; } else if (mUserPaddingRight < 0) { mUserPaddingRight = mPaddingRight; |