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

Commit 1aa52487 authored by Raph Levien's avatar Raph Levien Committed by Android Git Automerger
Browse files

am 6c072401: Merge "Fix for bug 8500202: Right-to-left text not showing in... 

am 6c072401: Merge "Fix for bug 8500202: Right-to-left text not showing in list view" into jb-mr2-dev

* commit '6c072401':
  Fix for bug 8500202: Right-to-left text not showing in list view
parents f151a541 6c072401

core/java/android/widget/TextView.java

+6 −1
Original line number Diff line number Diff line
@@ -5921,6 +5921,11 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener 
        }



        Layout.Alignment alignment = getLayoutAlignment();

        final boolean testDirChange = mSingleLine && mLayout != null &&

            (alignment == Layout.Alignment.ALIGN_NORMAL ||

             alignment == Layout.Alignment.ALIGN_OPPOSITE);

        int oldDir = 0;

        if (testDirChange) oldDir = mLayout.getParagraphDirection(0);

        boolean shouldEllipsize = mEllipsize != null && getKeyListener() == null;

        final boolean switchEllipsize = mEllipsize == TruncateAt.MARQUEE &&

                mMarqueeFadeMode != MARQUEE_FADE_NORMAL;
@@ -6009,7 +6014,7 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener 
            }

        }



        if (bringIntoView) {

        if (bringIntoView || (testDirChange && oldDir != mLayout.getParagraphDirection(0))) {

            registerForPreDraw();

        }