Merge "Fix bug #4796027 left/right padding regression after recent View change"
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;