commit 374d757e9c00d120b53703bb0573813bba7f11b7
author Fabrice Di Meglio <fdimeglio@google.com> Tue Jun 21 17:55:50 2011 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Tue Jun 21 17:55:50 2011 -0700
tree 0041e2879e16df23fc753332612dc8c1b5b02cf7
parent 40f6edf27b700405cd25471b1fbe53cc236cad51
parent f8ed444fad4c5bcb9c163ecb1303871c47e676d0

Merge "Fix bug #4796027 left/right padding regression after recent View change"

core/java/android/view/View.java

diff --git a/core/java/android/view/View.java b/core/java/android/view/View.java
index 4403591..7fcf762 100644
--- a/core/java/android/view/View.java
+++ b/core/java/android/view/View.java
@@ -8860,12 +8860,12 @@
                 // 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;