From b598ce95a28381ee24987cdfadcaf1b12d9c61b8 Mon Sep 17 00:00:00 2001 From: Sriram Ramasubramanian Date: Thu, 27 Jun 2013 15:01:27 -0700 Subject: [PATCH] Bug 888032: Restrict favicon size to 32dp in TopBookmarksView. [r=wesj] --- mobile/android/base/home/TopBookmarksView.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mobile/android/base/home/TopBookmarksView.java b/mobile/android/base/home/TopBookmarksView.java index 82da86e4c74..d28c124e243 100644 --- a/mobile/android/base/home/TopBookmarksView.java +++ b/mobile/android/base/home/TopBookmarksView.java @@ -5,6 +5,7 @@ package org.mozilla.gecko.home; +import org.mozilla.gecko.Favicons; import org.mozilla.gecko.R; import org.mozilla.gecko.ThumbnailHelper; import org.mozilla.gecko.db.BrowserContract.Thumbnails; @@ -372,7 +373,9 @@ public class TopBookmarksView extends GridView { if (!thumbnails.containsKey(url)) { final Bitmap bitmap = BrowserDB.getFaviconForUrl(cr, url); if (bitmap != null) { - thumbnails.put(url, new Thumbnail(bitmap, false)); + // Favicons.scaleImage can return several different size favicons, + // but will at least prevent this from being too large. + thumbnails.put(url, new Thumbnail(Favicons.getInstance().scaleImage(bitmap), false)); } } }