diff options
| author | Fabrice Di Meglio <fdimeglio@google.com> | 2012-10-01 16:04:39 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-10-01 16:04:40 -0700 |
| commit | efe9b483547ac44dbc88bdfd6a54be5c95c2d889 (patch) | |
| tree | 101cda06d5dd6bae952353a79bd58d33a8c8d7fd /core/java | |
| parent | 075bb6b3dfb9e58aa44c3b8588ab233a832956a3 (diff) | |
| parent | 6e6d78116b584272aeda6924d1802ba18d4b8758 (diff) | |
| download | frameworks_base-efe9b483547ac44dbc88bdfd6a54be5c95c2d889.zip frameworks_base-efe9b483547ac44dbc88bdfd6a54be5c95c2d889.tar.gz frameworks_base-efe9b483547ac44dbc88bdfd6a54be5c95c2d889.tar.bz2 | |
Merge "Fix bug #7259242 text is left justified with no padding" into jb-mr1-dev
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. |