Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0f328d48 authored by Lucas Dupin's avatar Lucas Dupin Committed by android-build-merger
Browse files

Merge "Add transfer mode support to ShapeDrawable" into oc-dev am: 498a44f3 

am: 914519ab

Change-Id: Ib61666ec7103dab2e40d6e68e8a49fcf4c46a9b2
parents 94d7dba7 914519ab

api/test-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -14347,6 +14347,7 @@ package android.graphics.drawable { 
    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



+13
−0




























Original line number
Diff line number
Diff line








@@ -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.PorterDuff.Mode;













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 @@ public class ShapeDrawable extends Drawable {













        invalidateSelf();















    }





























    /**













     * @hide













     */













    @Override













    @TestApi













    public void setXfermode(@Nullable Xfermode mode) {













        mShapeState.mPaint.setXfermode(mode);













        invalidateSelf();













    }





























    @Override















    public int getOpacity() {















        if (mShapeState.mShape == null) {