diff options
author | Deepanshu Gupta <deepanshu@google.com> | 2015-03-13 06:33:17 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2015-03-13 06:33:17 +0000 |
commit | a53f76dccefed73de71bb396179ad4291d669e1f (patch) | |
tree | aa94dcb10582e9a72b60db633722b006500356d6 /tools/layoutlib/bridge/src/android/graphics | |
parent | 1bbb9e1d5d6c5620cf5da3309159620c74f64cd1 (diff) | |
parent | 3d024d4c22b896c95ef4c98610c3db7c58a639ed (diff) | |
download | frameworks_base-a53f76dccefed73de71bb396179ad4291d669e1f.zip frameworks_base-a53f76dccefed73de71bb396179ad4291d669e1f.tar.gz frameworks_base-a53f76dccefed73de71bb396179ad4291d669e1f.tar.bz2 |
am 3d024d4c: am 65215edd: am f0d324e5: am 71ba1230: am efc09c64: am 78660423: Merge "Fix cyclic dependency in BlendComposite and BlendingMode." into lmp-dev
* commit '3d024d4c22b896c95ef4c98610c3db7c58a639ed':
Fix cyclic dependency in BlendComposite and BlendingMode.
Diffstat (limited to 'tools/layoutlib/bridge/src/android/graphics')
-rw-r--r-- | tools/layoutlib/bridge/src/android/graphics/BlendComposite.java | 25 |
1 files changed, 9 insertions, 16 deletions
diff --git a/tools/layoutlib/bridge/src/android/graphics/BlendComposite.java b/tools/layoutlib/bridge/src/android/graphics/BlendComposite.java index b9928fc..e4fcf1b 100644 --- a/tools/layoutlib/bridge/src/android/graphics/BlendComposite.java +++ b/tools/layoutlib/bridge/src/android/graphics/BlendComposite.java @@ -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; |