From 605218c57b2a88bf4c75b41ea4eb787c76e39950 Mon Sep 17 00:00:00 2001
From: Tsung-Mao Fang <tmfang@google.com>
Date: Thu, 6 Feb 2020 16:36:59 +0800
Subject: [PATCH] Show underline when text show a link

Hyperlinked text should have underline instead of using color only,
such that color blind users are able to compare to the surrounding text.

Change-Id: I7e93f76ebd40077710385e8670176e878b021ef8
Fix: 148839397
Test: visual see link in "Skip songs", "Silence interruptions", "Reach to check phone".
---
 src/com/android/settings/LinkifyUtils.java         | 2 +-
 src/com/android/settings/utils/AnnotationSpan.java | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/com/android/settings/LinkifyUtils.java b/src/com/android/settings/LinkifyUtils.java
index 5550db5216e..7da7ed24394 100644
--- a/src/com/android/settings/LinkifyUtils.java
+++ b/src/com/android/settings/LinkifyUtils.java
@@ -74,7 +74,7 @@ public class LinkifyUtils {
             @Override
             public void updateDrawState(TextPaint ds) {
                 super.updateDrawState(ds);
-                ds.setUnderlineText(false);
+                ds.setUnderlineText(true);
             }
         };
         spannableContent.setSpan(spannableLink, beginIndex, endIndex,
diff --git a/src/com/android/settings/utils/AnnotationSpan.java b/src/com/android/settings/utils/AnnotationSpan.java
index e6457dac793..1b8179d759a 100644
--- a/src/com/android/settings/utils/AnnotationSpan.java
+++ b/src/com/android/settings/utils/AnnotationSpan.java
@@ -50,7 +50,7 @@ public class AnnotationSpan extends URLSpan {
     @Override
     public void updateDrawState(TextPaint ds) {
         super.updateDrawState(ds);
-        ds.setUnderlineText(false);
+        ds.setUnderlineText(true);
     }
 
     public static CharSequence linkify(CharSequence rawText, LinkInfo... linkInfos) {