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

* commit 'f0d324e531e395674f71b3944623bd17fe74b372':
  Fix cyclic dependency in BlendComposite and BlendingMode.

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 b9928fce6c93..e4fcf1be32bd 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;