Add Java resources to content and chrome.

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

 // Copyright (c) 2012 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.graphics.Bitmap;
 import android.graphics.Canvas;
 import android.graphics.Color;
 import android.graphics.LinearGradient;
 import android.graphics.Paint;
 import android.graphics.Path;
 import android.graphics.Rect;
 import android.graphics.RectF;
 import android.graphics.drawable.BitmapDrawable;
 import android.graphics.drawable.Drawable;
 import android.net.Uri;
 import android.os.Build;
 import android.util.Log;
 
-import org.chromium.content.app.AppResource;
+import org.chromium.chrome.R;
 
 /**
  * Util class for bookmarks.
  */
 public class BookmarkUtils {
 
     // There is no public string defining this intent so if Home changes the value, we
     // have to update this string.
     private static final String INSTALL_SHORTCUT = "com.android.launcher.action.INSTALL_SHORTCUT";
     private static final int DEFAULT_RGB_VALUE = 145;
@@ skipping 50 matching lines @@
             int gValue, int bValue) {
         Bitmap bitmap = null;
         ActivityManager am = (ActivityManager) context.getSystemService(Context.ACTIVITY_SERVICE);
         int iconDimension = am.getLauncherLargeIconSize();
         int iconDensity = am.getLauncherLargeIconDensity();
         try {
             bitmap = Bitmap.createBitmap(iconDimension, iconDimension, Bitmap.Config.ARGB_8888);
             Canvas canvas = new Canvas(bitmap);
             Rect iconBounds = new Rect(0, 0, bitmap.getWidth(), bitmap.getHeight());
             if (favicon == null) {
-                assert AppResource.DRAWABLE_ICON_DEFAULT_FAVICON != 0;
-                favicon = getBitmapFromResourceId(context,
-                        AppResource.DRAWABLE_ICON_DEFAULT_FAVICON, iconDensity);
+                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));
             }
             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.");
         }
         return bitmap;
     }
 
     /**
      * Get the icon background asset.
      * @param context Context used to create the intent.
      * @return Bitmap favicon background asset.
      */
     private static Bitmap getIconBackground(Context context, int density) {
-        assert AppResource.MIPMAP_BOOKMARK_SHORTCUT_BACKGROUND != 0;
-        return getBitmapFromResourceId(context, AppResource.MIPMAP_BOOKMARK_SHORTCUT_BACKGROUND,
-                density);
+        return getBitmapFromResourceId(context, R.mipmap.homescreen_bg, density);
     }
 
     private static Bitmap getBitmapFromResourceId(Context context, int id, int density) {
         Drawable drawable = null;
         if (Build.VERSION.SDK_INT >= SDK_VERSION_FOR_ACCESS_TO_METHODS) {
             drawable = context.getResources().getDrawableForDensity(id, density);
         } else {
             drawable = context.getResources().getDrawable(id);
         }
         if (drawable instanceof BitmapDrawable) {
             BitmapDrawable bd = (BitmapDrawable) drawable;
             return bd.getBitmap();
         }
         assert false : "The drawable was not a bitmap drawable as expected";
         return null;
     }
 
     /**
      * Draw the favicon with dominant color.
      * @param context Context used to create the intent.
      * @param favicon favicon bitmap.
      * @param canvas Canvas that holds the favicon.
      * @param iconBounds Rectangle bounds needed to create the homescreen favicon.
      * @param rValue Red component of the dominant favicon color.
      * @param gValue Green component of the dominant favicon color.
      * @param bValue Blue component of the dominant favicon color.
      */
     private static void drawFaviconToCanvas(Context context, Bitmap favicon,
             Canvas canvas, Rect iconBounds, int rValue, int gValue, int bValue) {
-        assert AppResource.DIMENSION_FAVICON_SIZE != 0;
-        assert AppResource.DIMENSION_FAVICON_COLORSTRIP_CORNER_RADII != 0;
-        assert AppResource.DIMENSION_FAVICON_COLORSTRIP_HEIGHT != 0;
-        assert AppResource.DIMENSION_FAVICON_COLORSTRIP_PADDING != 0;
-        assert AppResource.DIMENSION_FAVICON_COLORSTRIP_WIDTH != 0;
-        assert AppResource.DIMENSION_FAVICON_FOLD_BORDER != 0;
-        assert AppResource.DIMENSION_FAVICON_FOLD_CORNER_RADII != 0;
-        assert AppResource.DIMENSION_FAVICON_FOLD_SHADOW != 0;
-        assert AppResource.DIMENSION_FAVICON_FOLD_SIZE != 0;
-
         int colorStripWidth = context.getResources().getDimensionPixelSize(
-                AppResource.DIMENSION_FAVICON_COLORSTRIP_WIDTH);
+                R.dimen.favicon_colorstrip_width);
         int colorStripHeight = context.getResources().getDimensionPixelSize(
-                AppResource.DIMENSION_FAVICON_COLORSTRIP_HEIGHT);
+                R.dimen.favicon_colorstrip_height);
         int colorStripPadding = context.getResources().getDimensionPixelSize(
-                AppResource.DIMENSION_FAVICON_COLORSTRIP_PADDING);
+                R.dimen.favicon_colorstrip_padding);
         int colorStripCornerRadii = context.getResources().getDimensionPixelSize(
-                AppResource.DIMENSION_FAVICON_COLORSTRIP_CORNER_RADII);
-        int foldSize = context.getResources().getDimensionPixelSize(
-                AppResource.DIMENSION_FAVICON_FOLD_SIZE);
+                R.dimen.favicon_colorstrip_corner_radii);
+        int foldSize = context.getResources().getDimensionPixelSize(R.dimen.favicon_fold_size);
         int foldCornerRadii = context.getResources().getDimensionPixelSize(
-                AppResource.DIMENSION_FAVICON_FOLD_CORNER_RADII);
-        int foldBorder = context.getResources().getDimensionPixelSize(
-                AppResource.DIMENSION_FAVICON_FOLD_BORDER);
-        int foldShadow = context.getResources().getDimensionPixelSize(
-                AppResource.DIMENSION_FAVICON_FOLD_SHADOW);
-        int faviconSize = context.getResources().getDimensionPixelSize(
-                AppResource.DIMENSION_FAVICON_SIZE);
+                R.dimen.favicon_fold_corner_radii);
+        int foldBorder = context.getResources().getDimensionPixelSize(R.dimen.favicon_fold_border);
+        int foldShadow = context.getResources().getDimensionPixelSize(R.dimen.favicon_fold_shadow);
+        int faviconSize = context.getResources().getDimensionPixelSize(R.dimen.favicon_size);
 
         float x1 = iconBounds.exactCenterX() - (colorStripWidth / 2.0f);
         float x2 = x1 + colorStripWidth;
         float y1 = iconBounds.height() - colorStripPadding;
         float y2 = y1 - colorStripHeight;
         int faviconColorAlpha100 = Color.argb(255, rValue, gValue, bValue);
         Paint stripPaint = new Paint(Paint.ANTI_ALIAS_FLAG);
         stripPaint.setColor(faviconColorAlpha100);
         stripPaint.setStyle(Paint.Style.FILL);
         Path stripPath = new Path();
@@ skipping 42 matching lines @@
             Bitmap scaledFavicon = Bitmap.createScaledBitmap(favicon, faviconSize, faviconSize,
                     true);
             canvas.drawBitmap(scaledFavicon,
                     iconBounds.exactCenterX() - scaledFavicon.getWidth() / 2.0f,
                     iconBounds.exactCenterY() - scaledFavicon.getHeight() / 2.0f, null);
         } catch (OutOfMemoryError e) {
             Log.w(TAG, "OutOfMemoryError while trying to draw bitmap on canvas.");
         }
     }
 }