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..2548e6a4beea7467d81b28abd3f39227168cbadc 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 |
@@ -9,7 +9,6 @@ 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; |
@@ -20,6 +19,7 @@ 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,7 +144,7 @@ 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(); |
@@ -152,12 +152,13 @@ public class PasswordGenerationAdapter extends BaseAdapter { |
@Override |
public void updateDrawState(TextPaint textPaint) { |
newt (away)
2016/03/10 02:45:13
Let's remove this method and delete password_gener
juncai
2016/03/11 23:53:05
Done.
|
- textPaint.setUnderlineText(false); |
+ super.updateDrawState(textPaint); |
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()); |