| Index: chrome/android/java/src/org/chromium/chrome/browser/compositor/bottombar/contextualsearch/ContextualSearchOptOutPromo.java
|
| diff --git a/chrome/android/java/src/org/chromium/chrome/browser/compositor/bottombar/contextualsearch/ContextualSearchOptOutPromo.java b/chrome/android/java/src/org/chromium/chrome/browser/compositor/bottombar/contextualsearch/ContextualSearchOptOutPromo.java
|
| index b662db8e153829636e573e51de7f6e6046b0bcb9..3accd6daffda1a602473b3a75aa7061f479064fb 100644
|
| --- a/chrome/android/java/src/org/chromium/chrome/browser/compositor/bottombar/contextualsearch/ContextualSearchOptOutPromo.java
|
| +++ b/chrome/android/java/src/org/chromium/chrome/browser/compositor/bottombar/contextualsearch/ContextualSearchOptOutPromo.java
|
| @@ -6,7 +6,6 @@ package org.chromium.chrome.browser.compositor.bottombar.contextualsearch;
|
|
|
| import android.content.Context;
|
| import android.text.method.LinkMovementMethod;
|
| -import android.text.style.ClickableSpan;
|
| import android.util.AttributeSet;
|
| import android.view.View;
|
| import android.widget.Button;
|
| @@ -15,6 +14,7 @@ import android.widget.TextView;
|
|
|
| import org.chromium.chrome.R;
|
| import org.chromium.ui.resources.dynamics.ViewResourceAdapter;
|
| +import org.chromium.ui.text.NoUnderlineClickableSpan;
|
| import org.chromium.ui.text.SpanApplier;
|
| import org.chromium.ui.text.SpanApplier.SpanInfo;
|
|
|
| @@ -85,18 +85,11 @@ public class ContextualSearchOptOutPromo extends RelativeLayout {
|
| // Fill in text with link to Settings.
|
| TextView optOutText = (TextView) findViewById(R.id.contextual_search_opt_out_text);
|
|
|
| - ClickableSpan settingsLink = new ClickableSpan() {
|
| + NoUnderlineClickableSpan settingsLink = new NoUnderlineClickableSpan() {
|
| @Override
|
| public void onClick(View view) {
|
| mHost.onPromoPreferenceClick();
|
| }
|
| -
|
| - // Disable underline on the link text.
|
| - @Override
|
| - public void updateDrawState(android.text.TextPaint textPaint) {
|
| - super.updateDrawState(textPaint);
|
| - textPaint.setUnderlineText(false);
|
| - }
|
| };
|
|
|
| optOutText.setText(SpanApplier.applySpans(
|
|
|