Re-use NoUnderlineClickableSpan which shows a clickable link with underlines turned off

chrome/android/java/src/org/chromium/chrome/browser/firstrun/ToSAndUMAFirstRunFragment.java

Index: chrome/android/java/src/org/chromium/chrome/browser/firstrun/ToSAndUMAFirstRunFragment.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/firstrun/ToSAndUMAFirstRunFragment.java b/chrome/android/java/src/org/chromium/chrome/browser/firstrun/ToSAndUMAFirstRunFragment.java
index 14aa3c6551fe12d376c31f0c3857765ff9307717..1de5d8d8788472a9f6bd1d51ae4df9c3e00fe36a 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/firstrun/ToSAndUMAFirstRunFragment.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/firstrun/ToSAndUMAFirstRunFragment.java
@@ -8,7 +8,6 @@ import android.content.Context;
 import android.os.Bundle;
 import android.text.TextPaint;
 import android.text.method.LinkMovementMethod;
-import android.text.style.ClickableSpan;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.View.OnClickListener;
@@ -20,6 +19,7 @@ import android.widget.TextView;
 import org.chromium.base.ApiCompatibilityUtils;
 import org.chromium.chrome.R;
 import org.chromium.chrome.browser.preferences.PrefServiceBridge;
+import org.chromium.ui.text.NoUnderlineClickableSpan;
 import org.chromium.ui.text.SpanApplier;
 import org.chromium.ui.text.SpanApplier.SpanInfo;
 
@@ -66,7 +66,7 @@ public class ToSAndUMAFirstRunFragment extends FirstRunPage {
         mTosAndPrivacy.setMovementMethod(LinkMovementMethod.getInstance());
 
         int linkColor = getResources().getColor(R.color.ui_link_text_color);

[newt (away), 2016/03/10 02:45:14]

Get rid of linkColor and delete the FreClickableSpan class altogether. This is
redundant work: we're overriding the color to the default link color.

[juncai, 2016/03/11 23:53:05]

Done.

-        ClickableSpan clickableTermsSpan = new FreClickableSpan(linkColor) {
+        FreClickableSpan clickableTermsSpan = new FreClickableSpan(linkColor) {
             @Override
             public void onClick(View widget) {
                 if (!isAdded()) return;
@@ -75,7 +75,7 @@ public class ToSAndUMAFirstRunFragment extends FirstRunPage {
             }
         };
 
-        ClickableSpan clickablePrivacySpan = new FreClickableSpan(linkColor) {
+        FreClickableSpan clickablePrivacySpan = new FreClickableSpan(linkColor) {
             @Override
             public void onClick(View widget) {
                 if (!isAdded()) return;
@@ -89,7 +89,7 @@ public class ToSAndUMAFirstRunFragment extends FirstRunPage {
     }
 
     // TODO(peconn): Move this out into a more general class.
-    private abstract static class FreClickableSpan extends ClickableSpan {
+    private abstract static class FreClickableSpan extends NoUnderlineClickableSpan {
         private final int mColor;
 
         /**
@@ -101,8 +101,8 @@ public class ToSAndUMAFirstRunFragment extends FirstRunPage {
 
         @Override
         public void updateDrawState(TextPaint textPaint) {
+            super.updateDrawState(textPaint);
             textPaint.setColor(mColor);
-            textPaint.setUnderlineText(false);
         }
     }