Index: chrome/android/java/src/org/chromium/chrome/browser/autofill/PasswordGenerationAdapter.java |
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/autofill/PasswordGenerationAdapter.java b/chrome/android/java/src/org/chromium/chrome/browser/autofill/PasswordGenerationAdapter.java |
index 1dd73e30015b0895b46ee7c0f5cd3e1f0306e329..1aed0d4440f7ce15ba34154d55ca9932339af54f 100644 |
--- a/chrome/android/java/src/org/chromium/chrome/browser/autofill/PasswordGenerationAdapter.java |
+++ b/chrome/android/java/src/org/chromium/chrome/browser/autofill/PasswordGenerationAdapter.java |
@@ -7,9 +7,7 @@ package org.chromium.chrome.browser.autofill; |
import android.content.Context; |
import android.text.SpannableString; |
import android.text.Spanned; |
-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.MeasureSpec; |
@@ -18,8 +16,8 @@ import android.widget.BaseAdapter; |
import android.widget.RelativeLayout.LayoutParams; |
import android.widget.TextView; |
-import org.chromium.base.ApiCompatibilityUtils; |
import org.chromium.chrome.R; |
+import org.chromium.ui.text.NoUnderlineClickableSpan; |
import java.util.Arrays; |
import java.util.List; |
@@ -144,20 +142,13 @@ public class PasswordGenerationAdapter extends BaseAdapter { |
.findViewById(R.id.password_generation_explanation); |
SpannableString explanationSpan = new SpannableString(mExplanationText); |
explanationSpan.setSpan( |
- new ClickableSpan() { |
+ new NoUnderlineClickableSpan() { |
@Override |
public void onClick(View view) { |
mDelegate.onSavedPasswordsLinkClicked(); |
} |
- |
- @Override |
- public void updateDrawState(TextPaint textPaint) { |
- textPaint.setUnderlineText(false); |
- textPaint.setColor(ApiCompatibilityUtils.getColor( |
- mContext.getResources(), |
- R.color.password_generation_link_text_color)); |
- } |
- }, mExplanationTextLinkRangeStart, mExplanationTextLinkRangeEnd, |
+ }, |
+ mExplanationTextLinkRangeStart, mExplanationTextLinkRangeEnd, |
Spanned.SPAN_INCLUSIVE_INCLUSIVE); |
explanation.setText(explanationSpan); |
explanation.setMovementMethod(LinkMovementMethod.getInstance()); |