From 34bd56b546bce47422a430d9d7806dc3cb4254bf Mon Sep 17 00:00:00 2001
From: Alan Viverette <alanv@google.com>
Date: Tue, 14 Jan 2014 18:19:09 -0800
Subject: [PATCH] Propagate first call to DrawableContainer.setAlpha() to
 children

BUG: 12530662
Change-Id: Idd972698d1a6805cb9f66ba4c2ddde97e1f8d2ca
---
 .../java/android/graphics/drawable/DrawableContainer.java    | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/graphics/java/android/graphics/drawable/DrawableContainer.java b/graphics/java/android/graphics/drawable/DrawableContainer.java
index a98b84f20c611..6144e69731b71 100644
--- 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) {