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

Commit 5521f65e authored by Deepanshu Gupta's avatar Deepanshu Gupta
Browse files

Fix cyclic dependency in BlendComposite and BlendingMode. 

Introduced in commit 1a10ca7e

Bug: http://b.android.com/159708
Change-Id: I6add5be3a933bbe4f8d888906e2aa1b2e35d045a
parent 24b4e572

tools/layoutlib/bridge/src/android/graphics/BlendComposite.java

+9 −16
Original line number Diff line number Diff line
@@ -37,17 +37,17 @@ import java.awt.image.WritableRaster; 
 */

public final class BlendComposite implements Composite {

    public enum BlendingMode {

        MULTIPLY(Multiply),

        SCREEN(Screen),

        DARKEN(Darken),

        LIGHTEN(Lighten),

        OVERLAY(Overlay),

        ADD(Add);

        MULTIPLY(),

        SCREEN(),

        DARKEN(),

        LIGHTEN(),

        OVERLAY(),

        ADD();



        private BlendComposite mComposite;

        private final BlendComposite mComposite;



        BlendingMode(BlendComposite composite) {

            mComposite = composite;

        BlendingMode() {

            mComposite = new BlendComposite(this);

        }



        BlendComposite getBlendComposite() {
@@ -55,13 +55,6 @@ public final class BlendComposite implements Composite { 
        }

    }



    public static final BlendComposite Multiply = new BlendComposite(BlendingMode.MULTIPLY);

    public static final BlendComposite Screen = new BlendComposite(BlendingMode.SCREEN);

    public static final BlendComposite Darken = new BlendComposite(BlendingMode.DARKEN);

    public static final BlendComposite Lighten = new BlendComposite(BlendingMode.LIGHTEN);

    public static final BlendComposite Overlay = new BlendComposite(BlendingMode.OVERLAY);

    public static final BlendComposite Add = new BlendComposite(BlendingMode.ADD);



    private float alpha;

    private BlendingMode mode;