diff options
author | Jeff Sharkey <jsharkey@android.com> | 2011-06-24 17:08:12 -0700 |
---|---|---|
committer | Jeff Sharkey <jsharkey@android.com> | 2011-06-24 17:08:12 -0700 |
commit | a0ac98bd5cb550319221c1d60277e07a9d2e3a91 (patch) | |
tree | 093e8ccf7ac61b71918abac7d499612e6a520bc3 /graphics/java | |
parent | 7656b21e6313671437c9fbc9bb16096072b1ead5 (diff) | |
download | frameworks_base-a0ac98bd5cb550319221c1d60277e07a9d2e3a91.zip frameworks_base-a0ac98bd5cb550319221c1d60277e07a9d2e3a91.tar.gz frameworks_base-a0ac98bd5cb550319221c1d60277e07a9d2e3a91.tar.bz2 |
Finish any enter animation when jumping to state.
When jumpDrawablesToCurrentState(), finish any alpha animation in
progress. Fixes bug where drawable with enter fade would remain
transparent until next state change.
Change-Id: Ia087f935566a8d78e0efdcb0a1a2f791db05c70e
Diffstat (limited to 'graphics/java')
-rw-r--r-- | graphics/java/android/graphics/drawable/DrawableContainer.java | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/graphics/java/android/graphics/drawable/DrawableContainer.java b/graphics/java/android/graphics/drawable/DrawableContainer.java index a9414e8..b0f7fd3 100644 --- a/graphics/java/android/graphics/drawable/DrawableContainer.java +++ b/graphics/java/android/graphics/drawable/DrawableContainer.java @@ -167,6 +167,7 @@ public class DrawableContainer extends Drawable implements Drawable.Callback { } if (mCurrDrawable != null) { mCurrDrawable.jumpToCurrentState(); + mCurrDrawable.setAlpha(mAlpha); } if (mExitAnimationEnd != 0) { mExitAnimationEnd = 0; |