Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 338a3853 authored by Fabrice Di Meglio's avatar Fabrice Di Meglio Committed by Android Git Automerger
Browse files

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

* commit 'efe9b483':
  Fix bug #7259242 text is left justified with no padding
parents e9234dd1 efe9b483

core/java/android/view/View.java

+2 −2
Original line number Original line Diff line number Diff line
@@ -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.