diff options
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 d4c4c3c..63ec577 100644 --- a/core/java/android/view/View.java +++ b/core/java/android/view/View.java @@ -3654,11 +3654,11 @@ public class View implements Drawable.Callback, KeyEvent.Callback, if (!leftPaddingDefined && startPaddingDefined) { leftPadding = startPadding; } - mUserPaddingLeftInitial = (leftPadding > 0) ? leftPadding : 0; + mUserPaddingLeftInitial = (leftPadding >= 0) ? leftPadding : mUserPaddingLeftInitial; if (!rightPaddingDefined && endPaddingDefined) { rightPadding = endPadding; } - mUserPaddingRightInitial = (rightPadding > 0) ? rightPadding : 0; + mUserPaddingRightInitial = (rightPadding >= 0) ? rightPadding : mUserPaddingRightInitial; } else { // Jelly Bean MR1 and after case: if start/end defined, they will override any left/right // values defined. Otherwise, left /right values are used. |