Index: chrome/android/java/src/org/chromium/chrome/browser/ntp/NewTabPageView.java |
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ntp/NewTabPageView.java b/chrome/android/java/src/org/chromium/chrome/browser/ntp/NewTabPageView.java |
index 988e128e8d55e5796099b99217e2d8960f9fdba0..25cb5f98d62a7ae82b8cff6957805b7c56d4956f 100644 |
--- a/chrome/android/java/src/org/chromium/chrome/browser/ntp/NewTabPageView.java |
+++ b/chrome/android/java/src/org/chromium/chrome/browser/ntp/NewTabPageView.java |
@@ -23,7 +23,6 @@ import android.text.Editable; |
import android.text.TextUtils; |
import android.text.TextWatcher; |
import android.text.method.LinkMovementMethod; |
-import android.text.style.ClickableSpan; |
import android.util.AttributeSet; |
import android.view.LayoutInflater; |
import android.view.MotionEvent; |
@@ -55,6 +54,7 @@ import org.chromium.chrome.browser.profiles.MostVisitedSites.MostVisitedURLsObse |
import org.chromium.chrome.browser.profiles.MostVisitedSites.ThumbnailCallback; |
import org.chromium.chrome.browser.util.ViewUtils; |
import org.chromium.chrome.browser.widget.RoundedIconGenerator; |
+import org.chromium.ui.text.NoUnderlineClickableSpan; |
import org.chromium.ui.text.SpanApplier; |
import org.chromium.ui.text.SpanApplier.SpanInfo; |
@@ -395,18 +395,11 @@ public class NewTabPageView extends FrameLayout |
// Fill in opt-out text with Settings link |
TextView optOutText = (TextView) mOptOutView.findViewById(R.id.opt_out_text); |
- ClickableSpan settingsLink = new ClickableSpan() { |
+ NoUnderlineClickableSpan settingsLink = new NoUnderlineClickableSpan() { |
@Override |
public void onClick(View view) { |
mManager.optOutPromoClicked(true); |
} |
- |
- // Disable underline on the link text. |
- @Override |
- public void updateDrawState(android.text.TextPaint textPaint) { |
- super.updateDrawState(textPaint); |
- textPaint.setUnderlineText(false); |
- } |
}; |
optOutText.setText(SpanApplier.applySpans( |