Chromium Code Reviews| Index: chrome/android/java/src/org/chromium/chrome/browser/signin/AccountSigninView.java |
| diff --git a/chrome/android/java/src/org/chromium/chrome/browser/signin/AccountSigninView.java b/chrome/android/java/src/org/chromium/chrome/browser/signin/AccountSigninView.java |
| index 46f2b1337d8b0672fa59127bac87e8baee340511..e3c967a8736d25b2a298c93dfbdce5bf3c41cd40 100644 |
| --- a/chrome/android/java/src/org/chromium/chrome/browser/signin/AccountSigninView.java |
| +++ b/chrome/android/java/src/org/chromium/chrome/browser/signin/AccountSigninView.java |
| @@ -12,7 +12,6 @@ import android.os.Bundle; |
| import android.text.TextPaint; |
| import android.text.TextUtils; |
| import android.text.method.LinkMovementMethod; |
| -import android.text.style.ClickableSpan; |
| import android.util.AttributeSet; |
| import android.view.View; |
| import android.widget.AdapterView; |
| @@ -37,6 +36,7 @@ import org.chromium.chrome.browser.sync.ui.ConfirmImportSyncDataDialog; |
| import org.chromium.chrome.browser.sync.ui.ConfirmImportSyncDataDialog.ImportSyncType; |
| import org.chromium.signin.InvestigatedScenario; |
| import org.chromium.sync.signin.AccountManagerHelper; |
| +import org.chromium.ui.text.NoUnderlineClickableSpan; |
| import org.chromium.ui.text.SpanApplier; |
| import org.chromium.ui.text.SpanApplier.SpanInfo; |
| @@ -487,7 +487,7 @@ public class AccountSigninView extends FirstRunView |
| setUpUndoButton(); |
| if (mShowSettingsSpan) { |
| - ClickableSpan settingsSpan = new ClickableSpan() { |
| + NoUnderlineClickableSpan settingsSpan = new NoUnderlineClickableSpan() { |
| @Override |
| public void onClick(View widget) { |
| mListener.onAccountSelected(mAccountName, true); |
| @@ -495,8 +495,8 @@ public class AccountSigninView extends FirstRunView |
| @Override |
| public void updateDrawState(TextPaint textPaint) { |
|
newt (away)
2016/03/10 02:45:14
Remove this method. Again, we shouldn't need to ov
juncai
2016/03/11 23:53:05
Done.
|
| + super.updateDrawState(textPaint); |
| textPaint.setColor(getResources().getColor(R.color.ui_link_text_color)); |
| - textPaint.setUnderlineText(false); |
| } |
| }; |
| mDescriptionText.setText(SpanApplier.applySpans(getSignedInDescription(mIsChildAccount), |