From ca8a04a36640eb227a556ad9ced925c48ced2495 Mon Sep 17 00:00:00 2001 From: Roozbeh Pournader Date: Tue, 6 Jun 2017 18:30:29 -0700 Subject: Get underline position and thickness from the font Previously, font underline position and thickness were fixed in Android. Although a custom font may have specified a different value, such a value would never be used. Now we use the values from the font if they are provided and fall back to the old default values only if needed. Bug: 62353930 Test: adb shell am instrument -w -e package android.graphics com.android.frameworks.coretests/android.support.test.runner.AndroidJUnitRunner Test: adb shell am instrument -w -e package android.text com.android.frameworks.coretests/android.support.test.runner.AndroidJUnitRunner Test: cts-tradefed run cts-dev --module CtsTextTestCases Test: Manual Change-Id: I6bf21000dd69a2780c894b231638bc0c122e41f4 --- core/java/android/text/TextLine.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'core/java/android/text/TextLine.java') diff --git a/core/java/android/text/TextLine.java b/core/java/android/text/TextLine.java index e4ed62a1ead9..d4de62fa919a 100644 --- a/core/java/android/text/TextLine.java +++ b/core/java/android/text/TextLine.java @@ -827,7 +827,9 @@ class TextLine { underlineXLeft, underlineXRight, y); } if (info.isUnderlineText) { - drawUnderline(wp, c, wp.getColor(), ((Paint) wp).getUnderlineThickness(), + final float thickness = + Math.max(((Paint) wp).getUnderlineThickness(), 1.0f); + drawUnderline(wp, c, wp.getColor(), thickness, underlineXLeft, underlineXRight, y); } } -- cgit v1.2.3