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

am fa8570bc: am 7026617e: am 1fcb6d3a: Merge "Respect style boundaries when measuring text" into mnc-dev

Browse Source 
* commit 'fa8570bcd205859b9068105b389a80de32f7f85d':
  Respect style boundaries when measuring text
This commit is contained in:
Raph Levien
2015-07-21 17:31:06 +00:00
committed by Android Git Automerger
parent 3b2ebfa3d1 fa8570bcd2
commit ab30f486ba
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/text/TextLine.java
View File

@@ -741,11 +741,11 @@ class TextLine {
if (needWidth || (c != null && (wp.bgColor != 0 || wp.underlineColor != 0 || runIsRtl))) { if (needWidth || (c != null && (wp.bgColor != 0 || wp.underlineColor != 0 || runIsRtl))) {
if (mCharsValid) { if (mCharsValid) {
ret = wp.getRunAdvance(mChars, start, contextEnd, contextStart, contextEnd, ret = wp.getRunAdvance(mChars, start, end, contextStart, contextEnd,
runIsRtl, end); runIsRtl, end);
} else { } else {
int delta = mStart; int delta = mStart;
ret = wp.getRunAdvance(mText, delta + start, delta + contextEnd, ret = wp.getRunAdvance(mText, delta + start, delta + end,
delta + contextStart, delta + contextEnd, runIsRtl, delta + end); delta + contextStart, delta + contextEnd, runIsRtl, delta + end);
} }
} }