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

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

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 package org.chromium.chrome.browser.firstrun;
 
 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;
 import android.view.ViewGroup;
 import android.widget.Button;
 import android.widget.CheckBox;
 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;
 
 /**
  * The First Run Experience fragment that allows the user to accept Terms of Service ("ToS") and
  * Privacy Notice, and to opt-in to the usage statistics and crash reports collection ("UMA",
  * User Metrics Analysis) as defined in the Chrome Privacy Notice.
  */
 public class ToSAndUMAFirstRunFragment extends FirstRunPage {
     private Button mAcceptButton;
@@ skipping 25 matching lines @@
         ApiCompatibilityUtils.setPaddingRelative(mSendReportCheckBox,
                 ApiCompatibilityUtils.getPaddingStart(mSendReportCheckBox) + paddingStart,
                 mSendReportCheckBox.getPaddingTop(),
                 ApiCompatibilityUtils.getPaddingEnd(mSendReportCheckBox),
                 mSendReportCheckBox.getPaddingBottom());
 
         mSendReportCheckBox.setChecked(!getPageDelegate().isNeverUploadCrashDump());
 
         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;
                 getPageDelegate().showEmbedContentViewActivity(R.string.terms_of_service_title,
                         R.string.chrome_terms_of_service_url);
             }
         };
 
-        ClickableSpan clickablePrivacySpan = new FreClickableSpan(linkColor) {
+        FreClickableSpan clickablePrivacySpan = new FreClickableSpan(linkColor) {
             @Override
             public void onClick(View widget) {
                 if (!isAdded()) return;
                 getPageDelegate().showEmbedContentViewActivity(R.string.privacy_notice_title,
                         R.string.chrome_privacy_notice_url);
             }
         };
         mTosAndPrivacy.setText(SpanApplier.applySpans(getString(R.string.fre_tos_and_privacy),
                 new SpanInfo("<LINK1>", "</LINK1>", clickableTermsSpan),
                 new SpanInfo("<LINK2>", "</LINK2>", clickablePrivacySpan)));
     }
 
     // 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;
 
         /**
          * Creates a clickable span that styles without an underline and uses the given color.
          */
         public FreClickableSpan(int color) {
             mColor = color;
         }
 
         @Override
         public void updateDrawState(TextPaint textPaint) {
+            super.updateDrawState(textPaint);
             textPaint.setColor(mColor);
-            textPaint.setUnderlineText(false);
         }
     }
 
     @Override
     public boolean shouldSkipPageOnCreate(Context appContext) {
         return PrefServiceBridge.getInstance().isFirstRunEulaAccepted();
     }
 }