Commit 325c2115 authored by Ioana Pandele's avatar Ioana Pandele Committed by Commit Bot

[Android]Remove bold spans from the password manager dialog

The bold spans are no longer used for any of the dialogs.

Bug: 1029828
Change-Id: I4dbf79c2900a629e1e3424151e4e2a0bd5d7a583
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1882317Reviewed-by: default avatarFriedrich [CET] <fhorschig@chromium.org>
Commit-Queue: Ioana Pandele <ioanap@chromium.org>
Cr-Commit-Position: refs/heads/master@{#720554}
parent 212beed4
...@@ -43,20 +43,12 @@ public class PasswordManagerDialogCoordinator { ...@@ -43,20 +43,12 @@ public class PasswordManagerDialogCoordinator {
mModel, customView, PasswordManagerDialogViewBinder::bind); mModel, customView, PasswordManagerDialogViewBinder::bind);
} }
public void showDialog(String title, String details, int boldRangeStart, int boldRangeEnd,
@DrawableRes int drawableId, String positiveButtonText, String negativeButtonText,
Callback<Integer> onClick, boolean primaryButtonFilled,
@ModalDialogManager.ModalDialogType int type) {
mMediator.setContents(title, details, boldRangeStart, boldRangeEnd, drawableId);
mMediator.setButtons(positiveButtonText, negativeButtonText, onClick, primaryButtonFilled);
mMediator.showDialog(type);
}
public void showDialog(String title, String details, @DrawableRes int drawableId, public void showDialog(String title, String details, @DrawableRes int drawableId,
String positiveButtonText, String negativeButtonText, Callback<Integer> onClick, String positiveButtonText, String negativeButtonText, Callback<Integer> onClick,
boolean primaryButtonFilled, @ModalDialogManager.ModalDialogType int type) { boolean primaryButtonFilled, @ModalDialogManager.ModalDialogType int type) {
showDialog(title, details, 0, 0, drawableId, positiveButtonText, negativeButtonText, mMediator.setContents(title, details, drawableId);
onClick, primaryButtonFilled, type); mMediator.setButtons(positiveButtonText, negativeButtonText, onClick, primaryButtonFilled);
mMediator.showDialog(type);
} }
public void addHelpButton(Runnable callback) { public void addHelpButton(Runnable callback) {
......
...@@ -11,10 +11,6 @@ import static org.chromium.chrome.browser.password_manager.PasswordManagerDialog ...@@ -11,10 +11,6 @@ import static org.chromium.chrome.browser.password_manager.PasswordManagerDialog
import static org.chromium.chrome.browser.password_manager.PasswordManagerDialogProperties.TITLE; import static org.chromium.chrome.browser.password_manager.PasswordManagerDialogProperties.TITLE;
import android.content.res.Resources; import android.content.res.Resources;
import android.graphics.Typeface;
import android.text.SpannableString;
import android.text.Spanned;
import android.text.style.StyleSpan;
import android.view.View; import android.view.View;
import androidx.annotation.DrawableRes; import androidx.annotation.DrawableRes;
...@@ -85,12 +81,11 @@ class PasswordManagerDialogMediator implements View.OnLayoutChangeListener { ...@@ -85,12 +81,11 @@ class PasswordManagerDialogMediator implements View.OnLayoutChangeListener {
mAndroidContentView.addOnLayoutChangeListener(this); mAndroidContentView.addOnLayoutChangeListener(this);
} }
void setContents(String title, String details, int boldRangeStart, int boldRangeEnd, void setContents(String title, String details, @DrawableRes int drawableId) {
@DrawableRes int drawableId) {
mModel.set(ILLUSTRATION, drawableId); mModel.set(ILLUSTRATION, drawableId);
mModel.set(TITLE, title); mModel.set(TITLE, title);
mModalDialogBuilder.with(ModalDialogProperties.CONTENT_DESCRIPTION, title); mModalDialogBuilder.with(ModalDialogProperties.CONTENT_DESCRIPTION, title);
mModel.set(DETAILS, addBoldSpanToDetails(details, boldRangeStart, boldRangeEnd)); mModel.set(DETAILS, details);
} }
void setButtons(String positiveButtonText, String negativeButtonText, Callback<Integer> onClick, void setButtons(String positiveButtonText, String negativeButtonText, Callback<Integer> onClick,
...@@ -112,15 +107,6 @@ class PasswordManagerDialogMediator implements View.OnLayoutChangeListener { ...@@ -112,15 +107,6 @@ class PasswordManagerDialogMediator implements View.OnLayoutChangeListener {
R.dimen.password_manager_dialog_min_vertical_space_to_show_illustration); R.dimen.password_manager_dialog_min_vertical_space_to_show_illustration);
} }
private SpannableString addBoldSpanToDetails(
String details, int boldRangeStart, int boldRangeEnd) {
SpannableString spannableDetails = new SpannableString(details);
StyleSpan boldSpan = new StyleSpan(Typeface.BOLD);
spannableDetails.setSpan(
boldSpan, boldRangeStart, boldRangeEnd, Spanned.SPAN_INCLUSIVE_INCLUSIVE);
return spannableDetails;
}
@Override @Override
public void onLayoutChange(View view, int left, int top, int right, int bottom, int oldLeft, public void onLayoutChange(View view, int left, int top, int right, int bottom, int oldLeft,
int oldTop, int oldRight, int oldBottom) { int oldTop, int oldRight, int oldBottom) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment