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

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

Browse Source 
* commit '6c0724010f1a98e391827109c2c369b64197c449':
  Fix for bug 8500202: Right-to-left text not showing in list view
This commit is contained in:
Raph Levien
2013-04-12 13:11:31 -07:00
committed by Android Git Automerger
parent f151a5411e 6c0724010f
commit 1aa5248785
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
core/java/android/widget/TextView.java
View File

@@ -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();
}