Merge "Fix bug #7259242 text is left justified with no padding" into jb-mr1-dev

Fabrice Di Meglio · Android (Google) Code Review · commit efe9b483547a · 2012-10-01T16:04:40.000-07:00
diff --git a/core/java/android/view/View.java b/core/java/android/view/View.java
@@ -3654,11 +3654,11 @@ public void onClick(View v) {
             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.

Original file line number	Diff line number	Diff line change
`@@ -3654,11 +3654,11 @@ public void onClick(View v) {`
`3654`	`3654`	`if (!leftPaddingDefined && startPaddingDefined) {`
`3655`	`3655`	`leftPadding = startPadding;`
`3656`	`3656`	`}`
`3657`		`- mUserPaddingLeftInitial = (leftPadding > 0) ? leftPadding : 0;`
	`3657`	`+ mUserPaddingLeftInitial = (leftPadding >= 0) ? leftPadding : mUserPaddingLeftInitial;`
`3658`	`3658`	`if (!rightPaddingDefined && endPaddingDefined) {`
`3659`	`3659`	`rightPadding = endPadding;`
`3660`	`3660`	`}`
`3661`		`- mUserPaddingRightInitial = (rightPadding > 0) ? rightPadding : 0;`
	`3661`	`+ mUserPaddingRightInitial = (rightPadding >= 0) ? rightPadding : mUserPaddingRightInitial;`
`3662`	`3662`	`} else {`
`3663`	`3663`	`// Jelly Bean MR1 and after case: if start/end defined, they will override any left/right`
`3664`	`3664`	`// values defined. Otherwise, left /right values are used.`