| Index: chrome/android/java/src/org/chromium/chrome/browser/contextmenu/ChromeContextMenuPopulator.java
|
| diff --git a/chrome/android/java/src/org/chromium/chrome/browser/contextmenu/ChromeContextMenuPopulator.java b/chrome/android/java/src/org/chromium/chrome/browser/contextmenu/ChromeContextMenuPopulator.java
|
| index b08de6ed41b4117cd43c10d79721dafdb8edc206..eafd161250a899c1fef3ffea4833763e6ac472e3 100644
|
| --- a/chrome/android/java/src/org/chromium/chrome/browser/contextmenu/ChromeContextMenuPopulator.java
|
| +++ b/chrome/android/java/src/org/chromium/chrome/browser/contextmenu/ChromeContextMenuPopulator.java
|
| @@ -5,10 +5,15 @@
|
| package org.chromium.chrome.browser.contextmenu;
|
|
|
| import android.content.Context;
|
| +import android.graphics.Typeface;
|
| import android.net.MailTo;
|
| import android.support.annotation.IntDef;
|
| import android.support.annotation.StringRes;
|
| +import android.text.SpannableString;
|
| +import android.text.SpannableStringBuilder;
|
| +import android.text.Spanned;
|
| import android.text.TextUtils;
|
| +import android.text.style.StyleSpan;
|
| import android.util.Pair;
|
| import android.view.ContextMenu;
|
| import android.webkit.MimeTypeMap;
|
| @@ -230,15 +235,33 @@ public class ChromeContextMenuPopulator implements ContextMenuPopulator {
|
| * Gets the link of the item or the alternate text of an image.
|
| * @return A string with either the link or with the alternate text.
|
| */
|
| - public static String createHeaderText(ContextMenuParams params) {
|
| - String titleText = "";
|
| + public static SpannableStringBuilder createHeaderText(ContextMenuParams params) {
|
| + SpannableStringBuilder result = new SpannableStringBuilder();
|
| + String text = "";
|
| +
|
| + if (!TextUtils.isEmpty(params.getLinkText())) {
|
| + text = params.getLinkText();
|
| + } else {
|
| + text = params.getTitleText();
|
| + }
|
| + // Add text in bold.
|
| + SpannableString spannableString = new SpannableString(text);
|
| + spannableString.setSpan(new StyleSpan(Typeface.BOLD), 0, spannableString.length(),
|
| + Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
|
| + result.append(spannableString);
|
| + text = "";
|
| +
|
| if (!TextUtils.isEmpty(params.getLinkUrl())
|
| && !params.getLinkUrl().equals(UrlConstants.ABOUT_BLANK_DISPLAY_URL)) {
|
| - titleText = params.getLinkUrl();
|
| - } else if (!TextUtils.isEmpty(params.getTitleText())) {
|
| - titleText = params.getTitleText();
|
| + text = params.getLinkUrl();
|
| + } else {
|
| + text = params.getSrcUrl();
|
| + }
|
| + if (result.length() != 0 && !TextUtils.isEmpty(text)) {
|
| + result.append("\r\n");
|
| }
|
| - return titleText;
|
| +
|
| + return result.append(text);
|
| }
|
|
|
| @Override
|
|
|