webapps: allow callers of icon downloader/selector to specify a minimum size

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

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 package org.chromium.chrome.browser;
 
 import android.app.ActivityManager;
 import android.content.Context;
 import android.content.Intent;
 import android.content.pm.PackageManager;
 import android.content.pm.ResolveInfo;
-import android.content.res.Resources;
 import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
 import android.graphics.Canvas;
 import android.graphics.Color;
 import android.graphics.Paint;
 import android.graphics.Path;
 import android.graphics.PorterDuff;
 import android.graphics.PorterDuffXfermode;
 import android.graphics.Rect;
 import android.graphics.RectF;
@@ skipping 266 matching lines @@
      * @param encodedString the Base64 String to decode.
      * @return the Bitmap which was encoded by the String.
      */
     public static Bitmap decodeBitmapFromString(String encodedString) {
         if (TextUtils.isEmpty(encodedString)) return null;
         byte[] decoded = Base64.decode(encodedString, Base64.DEFAULT);
         return BitmapFactory.decodeByteArray(decoded, 0, decoded.length);
     }
 
     /**
-     * Returns the ideal size for an image displayed on a web app's splash screen.
-     * @param resources Resources to retrieve the dimension from.
-     * @return the dimensions in dp which the image should have.
-     */
-    public static int getIdealSplashImageSizeInDp(Resources resources) {
-        return getIdealSizeFromResource(resources, R.dimen.webapp_splash_image_size);
-    }
-
-    /**
      * Returns the ideal size for an icon representing a web app.  This size is used on app banners,
      * the Android Home screen, and in Android's recent tasks list, among other places.
      * @param resources Resources to retrieve the dimension from.
      * @return the dimensions in dp which the icon should have.
      */
-    public static int getIdealIconSizeInDp(Resources resources) {
-        return getIdealSizeFromResource(resources, R.dimen.webapp_home_screen_icon_size);
+    public static int getIdealIconSizeInDp(Context context) {
+        return getIdealSizeFromResourceInDp(context, R.dimen.webapp_home_screen_icon_size);
     }
 
     /**
+     * Returns the minimum size for an icon representing a web app.  This size is used on app
+     * banners, the Android Home screen, and in Android's recent tasks list, among other places.
+     * @param resources Resources to retrieve the dimension from.
+     * @return the lower bound of the size which the icon should have in dp.
+     */
+    public static int getMinimumIconSizeInDp(Context context) {
+        float sizeInPx = context.getResources().getDimension(R.dimen.webapp_home_screen_icon_size);
+        float density = context.getResources().getDisplayMetrics().density;
+        float idealIconSizeInDp = sizeInPx / density;
+
+        float minimumIconSizeInPx = idealIconSizeInDp * (density - 1);
+        return Math.round(minimumIconSizeInPx / density);
+    }
+
+    /**
+     * Returns the ideal size for an image displayed on a web app's splash screen.
+     * @param resources Resources to retrieve the dimension from.
+     * @return the dimensions in dp which the image should have.
+     */
+    public static int getIdealSplashImageSizeInDp(Context context) {
+        return getIdealSizeFromResourceInDp(context, R.dimen.webapp_splash_image_size);
+    }
+
+    /**
+     * Returns the minimum size for an image displayed on a web app's splash screen.
+     * @param resources Resources to retrieve the dimension from.
+     * @return the lower bound of the size which the image should have in dp.
+     */
+    public static int getMinimumSplashImageSizeInDp(Context context) {
+        return getIdealSizeFromResourceInDp(context, R.dimen.webapp_splash_image_min_size);
+    }
+
+    /**
      * @return String that can be used to verify that a WebappActivity is being started by Chrome.
      */
     public static String getEncodedMac(Context context, String url) {
         // The only reason we convert to a String here is because Android inexplicably eats a
         // byte[] when adding the shortcut -- the Bundle received by the launched Activity even
         // lacks the key for the extra.
         byte[] mac = WebappAuthenticator.getMacForUrl(context, url);
         return Base64.encodeToString(mac, Base64.DEFAULT);
     }
 
-    private static int getIdealSizeFromResource(Resources resources, int resource) {
-        float sizeInPx = resources.getDimension(resource);
-        float density = resources.getDisplayMetrics().density;
+    /**
+     * Returns an array of sizes which describe the ideal size and minimum size of the home screen
+     * icon and the ideal and minimum sizes of the splash screen image in that order.
+     */
+    @CalledByNative
+    private static int[] getIconAndSplashImageSizes(Context context) {
+        // This ordering must be kept up to date with the C++ ShortcutHelper.
+        return new int[] {
+            getIdealIconSizeInDp(context),
+            getMinimumIconSizeInDp(context),
+            getIdealSplashImageSizeInDp(context),
+            getMinimumSplashImageSizeInDp(context)
+        };
+    }
+
+    private static int getIdealSizeFromResourceInDp(Context context, int resource) {
+        float sizeInPx = context.getResources().getDimension(resource);
+        float density = context.getResources().getDisplayMetrics().density;
         return Math.round(sizeInPx / density);
     }
 
     private static Bitmap getBitmapFromResourceId(Context context, int id, int density) {
         Drawable drawable = ApiCompatibilityUtils.getDrawableForDensity(
                 context.getResources(), id, density);
 
         if (drawable instanceof BitmapDrawable) {
             BitmapDrawable bd = (BitmapDrawable) drawable;
             return bd.getBitmap();
@@ skipping 49 matching lines @@
         int iconFontSize = (int) (GENERATED_ICON_FONT_SIZE_DP * density);
 
         RoundedIconGenerator generator = new RoundedIconGenerator(
                 iconSize, iconSize, iconRoundedEdge, color, iconFontSize);
         Bitmap icon = generator.generateIconForUrl(url);
         if (icon == null) return; // Bookmark URL does not have a domain.
         canvas.drawBitmap(icon, iconBounds.exactCenterX() - icon.getWidth() / 2.0f,
                 iconBounds.exactCenterY() - icon.getHeight() / 2.0f, null);
     }
 }