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

2014-01-15 02:24:44 +00:00
parent 78146ecb24 34bd56b546
commit c6c243bf01
1 changed files with 2 additions and 3 deletions
--- a/graphics/java/android/graphics/drawable/DrawableContainer.java
+++ b/graphics/java/android/graphics/drawable/DrawableContainer.java
@@ -120,9 +120,8 @@ public class DrawableContainer extends Drawable implements Drawable.Callback {

    @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) {