Merge "Reorder the drawing of underline/stroke and text" (6ff2dd32) · Commits · e / os / android_frameworks_base

core/java/android/text/TextLine.java

+3 −2

Original line number	Original line	Diff line number	Diff line
	@@ -824,6 +824,9 @@ public class TextLine {
	wp.setColor(previousColor);		wp.setColor(previousColor);
	}		}

			drawTextRun(c, wp, start, end, contextStart, contextEnd, runIsRtl,
			leftX, y + wp.baselineShift);

	if (numDecorations != 0) {		if (numDecorations != 0) {
	for (int i = 0; i < numDecorations; i++) {		for (int i = 0; i < numDecorations; i++) {
	final DecorationInfo info = decorations.get(i);		final DecorationInfo info = decorations.get(i);
	@@ -866,8 +869,6 @@ public class TextLine {
	}		}
	}		}

	drawTextRun(c, wp, start, end, contextStart, contextEnd, runIsRtl,
	leftX, y + wp.baselineShift);
	}		}

	return runIsRtl ? -totalWidth : totalWidth;		return runIsRtl ? -totalWidth : totalWidth;