diff options
| author | Jeff Sharkey <jsharkey@android.com> | 2011-06-24 23:12:38 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-06-24 23:12:38 -0700 |
| commit | f670be372ba8e23c098e77b3a749b6333af0435d (patch) | |
| tree | 0833b337ef66d410f59cab995fdb50e1c6619085 /graphics/java | |
| parent | 681873fcc9a9cafc65550082bcbecca97228c8a5 (diff) | |
| parent | a0ac98bd5cb550319221c1d60277e07a9d2e3a91 (diff) | |
| download | frameworks_base-f670be372ba8e23c098e77b3a749b6333af0435d.zip frameworks_base-f670be372ba8e23c098e77b3a749b6333af0435d.tar.gz frameworks_base-f670be372ba8e23c098e77b3a749b6333af0435d.tar.bz2 | |
Merge "Finish any enter animation when jumping to state."
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; |