Home shortcut should use touch icons when possible.

chrome/android/java/src/org/chromium/chrome/browser/BookmarkUtils.java

Index: chrome/android/java/src/org/chromium/chrome/browser/BookmarkUtils.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/BookmarkUtils.java b/chrome/android/java/src/org/chromium/chrome/browser/BookmarkUtils.java
index 337ad2979341e984dad6b63b8c8610ad9c30684e..fe43e3be164b80a0b7cc877c0bb0a1e781c4376d 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/BookmarkUtils.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/BookmarkUtils.java
@@ -13,6 +13,8 @@ import android.graphics.Color;
 import android.graphics.LinearGradient;
 import android.graphics.Paint;
 import android.graphics.Path;
+import android.graphics.PorterDuff;
+import android.graphics.PorterDuffXfermode;
 import android.graphics.Rect;
 import android.graphics.RectF;
 import android.graphics.drawable.BitmapDrawable;
@@ -35,6 +37,7 @@ public class BookmarkUtils {
     private static final String TAG = "BookmarkUtils";
     public static final String REUSE_URL_MATCHING_TAB_ELSE_NEW_TAB =
             "REUSE_URL_MATCHING_TAB_ELSE_NEW_TAB";
+    private static final int INSET_DIMENSION_FOR_TOUCHICON = 1;
     private static final int SDK_VERSION_FOR_ACCESS_TO_METHODS = 15;
 
     /**
@@ -85,8 +88,8 @@ public class BookmarkUtils {
             int gValue, int bValue) {
         Bitmap bitmap = null;
         ActivityManager am = (ActivityManager) context.getSystemService(Context.ACTIVITY_SERVICE);
-        int iconDimension = am.getLauncherLargeIconSize();
-        int iconDensity = am.getLauncherLargeIconDensity();
+        final int iconDimension = am.getLauncherLargeIconSize();
+        final int iconDensity = am.getLauncherLargeIconDensity();
         try {
             bitmap = Bitmap.createBitmap(iconDimension, iconDimension, Bitmap.Config.ARGB_8888);
             Canvas canvas = new Canvas(bitmap);
@@ -95,11 +98,16 @@ public class BookmarkUtils {
                 favicon = getBitmapFromResourceId(context, R.drawable.globe_favicon, iconDensity);
                 rValue = gValue = bValue = DEFAULT_RGB_VALUE;
             }
-            Bitmap icon = getIconBackground(context, iconDensity);
-            if (icon != null) {
-                canvas.drawBitmap(icon, null, iconBounds, new Paint(Paint.ANTI_ALIAS_FLAG));
+            final int smallestSide = iconDimension;
+            if (favicon.getWidth() >= smallestSide / 2 && favicon.getHeight() >= smallestSide / 2) {
+                drawTouchIconToCanvas(context, favicon, canvas, iconBounds);
+            } else {
+                Bitmap icon = getIconBackground(context, iconDensity);
+                if (icon != null) {
+                    canvas.drawBitmap(icon, null, iconBounds, new Paint(Paint.ANTI_ALIAS_FLAG));
+                }
+                drawFaviconToCanvas(context, favicon, canvas, iconBounds, rValue, gValue, bValue);
             }
-            drawFaviconToCanvas(context, favicon, canvas, iconBounds, rValue, gValue, bValue);
             canvas.setBitmap(null);
         } catch (OutOfMemoryError e) {
             Log.w(TAG, "OutOfMemoryError while trying to draw bitmap on canvas.");
@@ -132,6 +140,30 @@ public class BookmarkUtils {
     }
 
     /**
+     * Use touch-icon or higher-resolution favicon and round the corners.
+     * @param context    Context used to get resources.
+     * @param touchIcon  Touch icon bitmap.
+     * @param canvas     Canvas that holds the touch icon.
+     * @param iconBounds Rectangle bounds needed for adding rounded corners of the touch icon.
+     */
+    private static void drawTouchIconToCanvas(
+            Context context, Bitmap touchIcon, Canvas canvas, Rect iconBounds) {
+        Rect src = new Rect(0, 0, touchIcon.getWidth(), touchIcon.getHeight());
+        Paint paint = new Paint(Paint.ANTI_ALIAS_FLAG);
+        paint.setFilterBitmap(true);
+        canvas.drawBitmap(touchIcon, src, iconBounds, paint);

[Ted C, 2013/02/26 22:44:42]

purely for my understanding, what is the benefit of the second draw instead of
using a clipping path?

[aruslan, 2013/02/27 00:18:09]

It doesn't look like there is a way to anti-alias clip paths/clip regions
(#include <disclaimer>).
The Romain Guy's solution (as brilliant as it is) seems to be a bit overkill in
this particular context.

Hence, the setXfermode.

+        int borderRadii =
+                context.getResources().getDimensionPixelSize(R.dimen.touchicon_border_radii);
+        Path path = new Path();
+        path.setFillType(Path.FillType.INVERSE_WINDING);
+        RectF rect = new RectF(iconBounds);
+        rect.inset(INSET_DIMENSION_FOR_TOUCHICON, INSET_DIMENSION_FOR_TOUCHICON);
+        path.addRoundRect(rect, borderRadii, borderRadii, Path.Direction.CW);
+        paint.setXfermode(new PorterDuffXfermode(PorterDuff.Mode.CLEAR));
+        canvas.drawPath(path, paint);
+    }
+
+    /**
      * Draw the favicon with dominant color.
      * @param context Context used to create the intent.
      * @param favicon favicon bitmap.