Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am efc09c64: am 78660423: Merge "Fix cyclic dependency in BlendComposite and BlendingMode." into lmp-dev

Browse Source 
* commit 'efc09c644fa4e8354d54485aab6c0b18868284eb':
  Fix cyclic dependency in BlendComposite and BlendingMode.
This commit is contained in:
Deepanshu Gupta
2015-03-12 00:45:40 +00:00
committed by Android Git Automerger
parent b3cfb33489 efc09c644f
commit 71ba12308e
1 changed files with 9 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
tools/layoutlib/bridge/src/android/graphics/BlendComposite.java
View File

@@ -37,17 +37,17 @@ import java.awt.image.WritableRaster;
*/ */
public final class BlendComposite implements Composite { public final class BlendComposite implements Composite {
public enum BlendingMode { public enum BlendingMode {
MULTIPLY(Multiply), MULTIPLY(),
SCREEN(Screen), SCREEN(),
DARKEN(Darken), DARKEN(),
LIGHTEN(Lighten), LIGHTEN(),
OVERLAY(Overlay), OVERLAY(),
ADD(Add); ADD();
private BlendComposite mComposite; private final BlendComposite mComposite;
BlendingMode(BlendComposite composite) { BlendingMode() {
mComposite = composite; mComposite = new BlendComposite(this);
} }
BlendComposite getBlendComposite() { 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 float alpha;
private BlendingMode mode; private BlendingMode mode;