commit 498a44f33a72b6b977ecc317d7a0ac2e2763475e
author Lucas Dupin <dupin@google.com> Thu Apr 13 16:51:58 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Apr 13 16:52:01 2017 +0000
tree 3143cc48260e8268e75176893d0fa79695a38d65
parent 3d6225b4e27190d92bf1afebca5538865a514491
parent 98bf27bff49b416802474cccf74f14f51620f560

Merge "Add transfer mode support to ShapeDrawable" into oc-dev

api/test-current.txt

diff --git a/api/test-current.txt b/api/test-current.txt
index c65d8da..e27f513 100644
--- a/api/test-current.txt
+++ b/api/test-current.txt
@@ -14359,6 +14359,7 @@
     method public void setPadding(android.graphics.Rect);
     method public void setShaderFactory(android.graphics.drawable.ShapeDrawable.ShaderFactory);
     method public void setShape(android.graphics.drawable.shapes.Shape);
+    method public void setXfermode(android.graphics.Xfermode);
   }
 
   public static abstract class ShapeDrawable.ShaderFactory {

graphics/java/android/graphics/drawable/ShapeDrawable.java

diff --git a/graphics/java/android/graphics/drawable/ShapeDrawable.java b/graphics/java/android/graphics/drawable/ShapeDrawable.java
index c43899b..34da928 100644
--- a/graphics/java/android/graphics/drawable/ShapeDrawable.java
+++ b/graphics/java/android/graphics/drawable/ShapeDrawable.java
@@ -17,6 +17,8 @@
 package android.graphics.drawable;
 
 import android.annotation.NonNull;
+import android.annotation.Nullable;
+import android.annotation.TestApi;
 import android.content.pm.ActivityInfo.Config;
 import android.content.res.ColorStateList;
 import android.content.res.Resources;
@@ -32,6 +34,7 @@
 import android.graphics.PorterDuffColorFilter;
 import android.graphics.Rect;
 import android.graphics.Shader;
+import android.graphics.Xfermode;
 import android.graphics.drawable.shapes.Shape;
 import android.util.AttributeSet;
 
@@ -306,6 +309,16 @@
         invalidateSelf();
     }
 
+    /**
+     * @hide
+     */
+    @Override
+    @TestApi
+    public void setXfermode(@Nullable Xfermode mode) {
+        mShapeState.mPaint.setXfermode(mode);
+        invalidateSelf();
+    }
+
     @Override
     public int getOpacity() {
         if (mShapeState.mShape == null) {