Android::Pass Bitmap.Config instead of bool to CreateJavaBitmap

ui/android/java/src/org/chromium/ui/gfx/BitmapHelper.java

 // Copyright 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.ui.gfx;
 
 import android.content.res.Resources;
 import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
 
 import org.chromium.base.CalledByNative;
 import org.chromium.base.JNINamespace;
 
 /**
  * Helper class to decode and sample down bitmap resources.
  */
 @JNINamespace("gfx")
 public class BitmapHelper {
     @CalledByNative
     private static Bitmap createBitmap(int width,
                                       int height,
-                                      boolean is565Config) {
-        if (is565Config) {
-            return Bitmap.createBitmap(width, height, Bitmap.Config.RGB_565);
-        }
-        return Bitmap.createBitmap(width, height, Bitmap.Config.ARGB_8888);
+                                      int bitmapFormatValue) {
+        Bitmap.Config bitmapConfig = getJavabitmapConfig(bitmapFormatValue);
+        return Bitmap.createBitmap(width, height, bitmapConfig);
     }
 
     /**
      * Decode and sample down a bitmap resource to the requested width and height.
      *
      * @param name The resource name of the bitmap to decode.
      * @param reqWidth The requested width of the resulting bitmap.
      * @param reqHeight The requested height of the resulting bitmap.
      * @return A bitmap sampled down from the original with the same aspect ratio and dimensions.
      *         that are equal to or greater than the requested width and height.
@@ skipping 39 matching lines @@
         return inSampleSize;
     }
 
     /**
      * Provides a matching integer constant for the Bitmap.Config value passed.
      *
      * @param bitmapConfig The Bitmap Configuration value.
      * @return Matching integer constant for the Bitmap.Config value passed.
      */
     @CalledByNative
-    private static int bitmapConfig(Bitmap.Config bitmapConfig) {
+    private static int getConfigEnumValue(Bitmap.Config bitmapConfig) {

[bulach, 2014/03/04 13:05:13]

nit: how about "getBitmapFormatForConfig"
and the following "getBitmapConfigForFormat" so they're kind of symmetrical?

[sivag, 2014/03/04 13:57:55]

Done.

         switch (bitmapConfig) {
             case ALPHA_8:
                 return BitmapFormat.FORMAT_ALPHA_8;
             case ARGB_4444:
                 return BitmapFormat.FORMAT_ARGB_4444;
             case ARGB_8888:
                 return BitmapFormat.FORMAT_ARGB_8888;
             case RGB_565:
                 return BitmapFormat.FORMAT_RGB_565;
             default:
                 return BitmapFormat.FORMAT_NO_CONFIG;
         }
     }
+
+     /**
+     * Provides a matching Bitmap.Config for the enum config value passed.
+     *
+     * @param bitmapFormatValue The Bitmap Configuration enum value.
+     * @return Matching Bitmap.Config  for the enum value passed.
+     */
+    private static Bitmap.Config getJavabitmapConfig(int bitmapFormatValue) {

[bulach, 2014/03/04 13:05:13]

nit: I'd prefer my suggestion above, but if we decide not to go with it,
s/getJavabitmap/getJavaBitmap/

[sivag, 2014/03/04 13:57:55]

Done.

+        switch (bitmapFormatValue) {
+            case BitmapFormat.FORMAT_ALPHA_8:
+                return Bitmap.Config.ALPHA_8;
+            case BitmapFormat.FORMAT_ARGB_4444:
+                return Bitmap.Config.ARGB_4444;
+            case BitmapFormat.FORMAT_RGB_565:
+                return Bitmap.Config.RGB_565;
+            case BitmapFormat.FORMAT_ARGB_8888:
+                default:

[bulach, 2014/03/04 13:05:13]

nit: unindent "default" and keep at the same level as the "case"

[sivag, 2014/03/04 13:57:55]

Done.

+                return Bitmap.Config.ARGB_8888;
+        }
+    }
+
 }