diff options
| author | Alan Viverette <alanv@google.com> | 2014-01-14 18:19:09 -0800 |
|---|---|---|
| committer | Alan Viverette <alanv@google.com> | 2014-01-14 18:19:09 -0800 |
| commit | 34bd56b546bce47422a430d9d7806dc3cb4254bf (patch) | |
| tree | ab7f3aba08ac8cd761043ebff3dfa5f6a2ec0966 /graphics | |
| parent | 4a5eb8fe18337597ece6ca1cedbbb56a0b309c39 (diff) | |
| download | frameworks_base-34bd56b546bce47422a430d9d7806dc3cb4254bf.zip frameworks_base-34bd56b546bce47422a430d9d7806dc3cb4254bf.tar.gz frameworks_base-34bd56b546bce47422a430d9d7806dc3cb4254bf.tar.bz2 | |
Propagate first call to DrawableContainer.setAlpha() to children
BUG: 12530662
Change-Id: Idd972698d1a6805cb9f66ba4c2ddde97e1f8d2ca
Diffstat (limited to 'graphics')
| -rw-r--r-- | graphics/java/android/graphics/drawable/DrawableContainer.java | 5 |
1 files changed, 2 insertions, 3 deletions
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 @@ 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) { |