Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 338a3853: am efe9b483: Merge "Fix bug #7259242 text is left justified with no padding" into jb-mr1-dev

Browse Source 
* commit '338a3853e8cdd05fb87d623d8a1b476a329646e3':
  Fix bug #7259242 text is left justified with no padding
This commit is contained in:
Fabrice Di Meglio
2012-10-01 16:09:08 -07:00
committed by Android Git Automerger
parent 5c68e4003b 338a3853e8
commit 44bfaedd1e
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/java/android/view/View.java
View File

@@ -3654,11 +3654,11 @@ public class View implements Drawable.Callback, KeyEvent.Callback,
if (!leftPaddingDefined && startPaddingDefined) { if (!leftPaddingDefined && startPaddingDefined) {
leftPadding = startPadding; leftPadding = startPadding;
} }
mUserPaddingLeftInitial = (leftPadding > 0) ? leftPadding : 0; mUserPaddingLeftInitial = (leftPadding >= 0) ? leftPadding : mUserPaddingLeftInitial;
if (!rightPaddingDefined && endPaddingDefined) { if (!rightPaddingDefined && endPaddingDefined) {
rightPadding = endPadding; rightPadding = endPadding;
} }
mUserPaddingRightInitial = (rightPadding > 0) ? rightPadding : 0; mUserPaddingRightInitial = (rightPadding >= 0) ? rightPadding : mUserPaddingRightInitial;
} else { } else {
// Jelly Bean MR1 and after case: if start/end defined, they will override any left/right // Jelly Bean MR1 and after case: if start/end defined, they will override any left/right
// values defined. Otherwise, left /right values are used. // values defined. Otherwise, left /right values are used.