added support for overlayColor property for image

Summary:
In Android, Fresco's default rounding corners support mode is BITMAP_ONLY which doesn't work in all cases (such as animated GIF's, some scale types, etc.).
Specifying the new "overlayColor" property on an Image will cause Fresco to switch to the other rounding corners mode, OVERLAY_COLOR, and will draw rounded corners by overlaying the solid color specified.

Fresco's behaviour is explained here: http://frescolib.org/docs/rounded-corners-and-circles.html
Closes #5366

Reviewed By: svcscm

Differential Revision: D2854696

Pulled By: mkonicek

fb-gh-sync-id: 251701ee8a64acbfc22694e9d4661c40eef75725

Libraries/Components/View/ReactNativeStyleAttributes.js

@@ -47,5 +47,6 @@ ReactNativeStyleAttributes.shadowColor = colorAttributes;
 ReactNativeStyleAttributes.textDecorationColor = colorAttributes;
 ReactNativeStyleAttributes.tintColor = colorAttributes;
 ReactNativeStyleAttributes.textShadowColor = colorAttributes;
+ReactNativeStyleAttributes.overlayColor = colorAttributes;
 
 module.exports = ReactNativeStyleAttributes;

Libraries/Image/ImageStylePropTypes.js

@@ -30,10 +30,31 @@ var ImageStylePropTypes = {
   borderRadius: ReactPropTypes.number,
   overflow: ReactPropTypes.oneOf(['visible', 'hidden']),
 
-  // iOS-Specific style to "tint" an image.
-  // It changes the color of all the non-transparent pixels to the tintColor
+  /** 
+   * iOS-Specific style to "tint" an image.
+   * Changes the color of all the non-transparent pixels to the tintColor.
+   * @platform ios
+   */
   tintColor: ColorPropType,
   opacity: ReactPropTypes.number,
+  /**
+   * When the image has rounded corners, specifying an overlayColor will
+   * cause the remaining space in the corners to be filled with a solid color.
+   * This is useful in cases which are not supported by the Android
+   * implementation of rounded corners:
+   *   - Certain resize modes, such as 'contain'
+   *   - Animated GIFs
+   * 
+   * A typical way to use this prop is with images displayed on a solid
+   * background and setting the `overlayColor` to the same color
+   * as the background.
+   *
+   * For details of how this works under the hood, see
+   * http://frescolib.org/docs/rounded-corners-and-circles.html
+   *
+   * @platform android
+  */
+  overlayColor: ReactPropTypes.string,
 };
 
 module.exports = ImageStylePropTypes;

ReactAndroid/src/main/java/com/facebook/react/views/image/ReactImageManager.java

@@ -88,6 +88,15 @@ public void setBorderColor(ReactImageView view, @Nullable Integer borderColor) {
     }
   }
 
+  @ReactProp(name = "overlayColor")
+  public void setOverlayColor(ReactImageView view, @Nullable Integer overlayColor) {
+    if (overlayColor == null) {
+      view.setOverlayColor(Color.TRANSPARENT);
+    } else {
+      view.setOverlayColor(overlayColor);
+    }
+  }
+
   @ReactProp(name = "borderWidth")
   public void setBorderWidth(ReactImageView view, float borderWidth) {
     view.setBorderWidth(borderWidth);

ReactAndroid/src/main/java/com/facebook/react/views/image/ReactImageView.java

@@ -16,6 +16,7 @@
 import android.graphics.BitmapShader;
 import android.graphics.Canvas;
 import android.graphics.drawable.Drawable;
+import android.graphics.Color;
 import android.graphics.Matrix;
 import android.graphics.Paint;
 import android.graphics.Rect;
@@ -108,6 +109,7 @@ public void process(Bitmap output, Bitmap source) {
   private @Nullable Uri mUri;
   private @Nullable Drawable mLoadingImageDrawable;
   private int mBorderColor;
+  private int mOverlayColor;
   private float mBorderWidth;
   private float mBorderRadius;
   private ScalingUtils.ScaleType mScaleType;
@@ -186,6 +188,11 @@ public void setBorderColor(int borderColor) {
     mIsDirty = true;
   }
 
+  public void setOverlayColor(int overlayColor) {
+    mOverlayColor = overlayColor;
+    mIsDirty = true;
+  }
+
   public void setBorderWidth(float borderWidth) {
     mBorderWidth = PixelUtil.toPixelFromDIP(borderWidth);
     mIsDirty = true;
@@ -266,6 +273,12 @@ public void maybeUpdateView() {
     RoundingParams roundingParams = hierarchy.getRoundingParams();
     roundingParams.setCornersRadius(hierarchyRadius);
     roundingParams.setBorder(mBorderColor, mBorderWidth);
+    if (mOverlayColor != Color.TRANSPARENT) {
+        roundingParams.setOverlayColor(mOverlayColor);
+    } else {
+        // make sure the default rounding method is used.
+        roundingParams.setRoundingMethod(RoundingParams.RoundingMethod.BITMAP_ONLY);
+    }
     hierarchy.setRoundingParams(roundingParams);
     hierarchy.setFadeDuration(
         mFadeDurationMs >= 0