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

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

Browse Source 
* commit '78660423900fa255cc83b85320e98d5184be393b':
  Fix cyclic dependency in BlendComposite and BlendingMode.
This commit is contained in:
Deepanshu Gupta
2015-03-12 00:38:45 +00:00
committed by Android Git Automerger
parent c706a980e4 7866042390
commit efc09c644f
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 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;