commit c6c243bf01fe74c8f2fe266c3540822324bee0ea
author Alan Viverette <alanv@google.com> Wed Jan 15 02:24:44 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Jan 15 02:24:44 2014 +0000
tree e3e59bc01a2d1b0c8016de9396a80f2b8d6d75d3
parent 78146ecb24871302a4c4dc0a7341044a06d29ee8
parent 34bd56b546bce47422a430d9d7806dc3cb4254bf

Merge "Propagate first call to DrawableContainer.setAlpha() to children"

graphics/java/android/graphics/drawable/DrawableContainer.java

diff --git a/graphics/java/android/graphics/drawable/DrawableContainer.java b/graphics/java/android/graphics/drawable/DrawableContainer.java
index a98b84f..6144e69 100644
--- a/graphics/java/android/graphics/drawable/DrawableContainer.java
+++ b/graphics/java/android/graphics/drawable/DrawableContainer.java
@@ -120,9 +120,8 @@
 
     @Override
     public void setAlpha(int alpha) {
-        mHasAlpha = true;
-
-        if (mAlpha != alpha) {
+        if (!mHasAlpha || mAlpha != alpha) {
+            mHasAlpha = true;
             mAlpha = alpha;
             if (mCurrDrawable != null) {
                 if (mEnterAnimationEnd == 0) {