Merge "Reorder the drawing of underline/stroke and text"

2018-05-22 20:26:58 +00:00
parent 6c1c5be87f 50fe78805d
commit 6ff2dd3213
1 changed files with 3 additions and 2 deletions
--- a/core/java/android/text/TextLine.java
+++ b/core/java/android/text/TextLine.java
@@ -824,6 +824,9 @@ public class TextLine {
                wp.setColor(previousColor);
            }

+            drawTextRun(c, wp, start, end, contextStart, contextEnd, runIsRtl,
+                    leftX, y + wp.baselineShift);
+
            if (numDecorations != 0) {
                for (int i = 0; i < numDecorations; 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;