Fix bug #7259242 text is left justified with no padding
(padding is still hard)
- fix Toasts: basically the background drawable padding was not
taken into account
Change-Id: Iefd29782f50b6f6a56578cfeb2af119d381207f0
diff --git a/core/java/android/view/View.java b/core/java/android/view/View.java
index ef75289..4838fb7 100644
--- a/core/java/android/view/View.java
+++ b/core/java/android/view/View.java
@@ -3654,11 +3654,11 @@
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.