Use exact pixel sizes instead of dip in webapp/WebAPK installability code

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.annotation.SuppressLint;
 import android.app.ActivityManager;
 import android.content.Context;
 import android.content.Intent;
@@ skipping 484 matching lines @@
         byte[] decoded = Base64.decode(encodedString, Base64.DEFAULT);
         return BitmapFactory.decodeByteArray(decoded, 0, decoded.length);
     }
 
     /**
      * 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 getIdealHomescreenIconSizeInDp(Context context) {
-        return getIdealSizeFromResourceInDp(context, R.dimen.webapp_home_screen_icon_size);
+    public static int getIdealHomescreenIconSizeInPx(Context context) {
+        return getIdealSizeFromResourceInPx(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 getMinimumHomescreenIconSizeInDp(Context context) {
+    public static int getMinimumHomescreenIconSizeInPx(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);
+        return Math.round(idealIconSizeInDp * (density - 1));
     }
 
     /**
      * 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_ideal);
+    public static int getIdealSplashImageSizeInPx(Context context) {
+        return getIdealSizeFromResourceInPx(context, R.dimen.webapp_splash_image_size_ideal);
     }
 
     /**
      * 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_size_minimum);
+    public static int getMinimumSplashImageSizeInPx(Context context) {
+        return getIdealSizeFromResourceInPx(context, R.dimen.webapp_splash_image_size_minimum);
     }
 
     /**
      * @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);
@@ skipping 36 matching lines @@
 
     /**
      * 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[] getHomeScreenIconAndSplashImageSizes() {
         Context context = ContextUtils.getApplicationContext();
         // This ordering must be kept up to date with the C++ ShortcutHelper.
         return new int[] {
-            getIdealHomescreenIconSizeInDp(context),
-            getMinimumHomescreenIconSizeInDp(context),
-            getIdealSplashImageSizeInDp(context),
-            getMinimumSplashImageSizeInDp(context)
+            getIdealHomescreenIconSizeInPx(context),
+            getMinimumHomescreenIconSizeInPx(context),
+            getIdealSplashImageSizeInPx(context),
+            getMinimumSplashImageSizeInPx(context)
         };
     }
 
     /**
      * Returns true if we should add padding to this icon. We use a heuristic that if the pixels in
      * all four corners of the icon are not transparent, we assume the icon is square and maximally
      * sized, i.e. in need of padding. Otherwise, no padding is added.
      */
     private static boolean shouldPadIcon(Bitmap icon) {
         int maxX = icon.getWidth() - 1;
         int maxY = icon.getHeight() - 1;
 
         if ((Color.alpha(icon.getPixel(0, 0)) != 0) && (Color.alpha(icon.getPixel(maxX, maxY)) != 0)
                 && (Color.alpha(icon.getPixel(0, maxY)) != 0)
                 && (Color.alpha(icon.getPixel(maxX, 0)) != 0)) {
             return true;
         }
         return false;
     }
 
-    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 int getIdealSizeFromResourceInPx(Context context, int resource) {

[dominickn, 2016/12/19 06:23:32]

Nit: rename this to getSizeFromResourceInPx (it's used for a minimum as well as
ideal).

+        return Math.round(context.getResources().getDimension(resource));
     }
 
     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();
         }
         assert false : "The drawable was not a bitmap drawable as expected";
         return null;
     }
 
     private static native void nativeOnWebappDataStored(long callbackPointer);
 }