commit 5c69ca2b6d9e33fa84c78355d68215d88c6f23b2
author Deepanshu Gupta <deepanshu@google.com> Thu Mar 12 00:53:12 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Thu Mar 12 00:53:12 2015 +0000
tree d671891f3ebde24a5151e9c9b596b01a4cbf9e1c
parent 49d3c36134f818e06dc6c71d462ee8369c73c195
parent 71ba12308e338595d8068ff788bb5c8abfcfe515

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

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

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

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 @@
  */
 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 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;