chrome/android/java/src/org/chromium/chrome/browser/bookmark/ShortcutActivity.java - Issue 1420743002: Web app: set a flag on the Intent if the icon was generated by Chromium.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/android/java/src/org/chromium/chrome/browser/bookmark/ShortcutActivity.java

Issue 1420743002: Web app: set a flag on the Intent if the icon was generated by Chromium. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@splashscreen-even-more-tests

Patch Set: review comments Created 5 years, 2 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/android/java/src/org/chromium/chrome/browser/ShortcutHelper.java ('k') | chrome/android/java/src/org/chromium/chrome/browser/webapps/AddToHomescreenDialogHelper.java » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/android/java/src/org/chromium/chrome/browser/bookmark/ShortcutActivity.java

diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmark/ShortcutActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/bookmark/ShortcutActivity.java

index 6c8bae699604d79a84fca2e351a4abafa52b06f3..b052e0246f0a495bc8ae1f6a613bd4bbcea9e164 100644

--- a/chrome/android/java/src/org/chromium/chrome/browser/bookmark/ShortcutActivity.java

+++ b/chrome/android/java/src/org/chromium/chrome/browser/bookmark/ShortcutActivity.java

@@ -71,9 +71,15 @@ public class ShortcutActivity extends AsyncInitializationActivity implements

@Override

public void onBookmarkSelected(String url, String title, Bitmap favicon) {

- int dominantColor = FaviconHelper.getDominantColorForBitmap(favicon);

- Bitmap launcherIcon = ShortcutHelper.createLauncherIcon(this, favicon, url,

- Color.red(dominantColor), Color.green(dominantColor), Color.blue(dominantColor));

+ Bitmap launcherIcon;

+ if (ShortcutHelper.isIconLargeEnoughForLauncher(this, favicon)) {

+ launcherIcon = ShortcutHelper.modifyIconForLauncher(this, favicon);

+ } else {

+ int dominantColor = FaviconHelper.getDominantColorForBitmap(favicon);

+ launcherIcon = ShortcutHelper.generateLauncherIcon(this, url, Color.red(dominantColor),

+ Color.green(dominantColor), Color.blue(dominantColor));

+ }

Intent intent = ShortcutHelper.createAddToHomeIntent(url, title, launcherIcon);

intent.putExtra(ShortcutHelper.EXTRA_SOURCE, ShortcutSource.BOOKMARK_SHORTCUT_WIDGET);

setResult(RESULT_OK, intent);