diff options
| author | Romain Guy <romainguy@google.com> | 2012-11-26 09:51:44 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-11-26 09:51:44 -0800 |
| commit | 458bf39e4cf9297d84a39413fcd2caa9fb81c006 (patch) | |
| tree | 2cdca3c725f48be03fae0450929f7c429f1c5a26 /graphics | |
| parent | 8508d7ef6364920e02970f4264dde098762f1842 (diff) | |
| parent | 713bebdac508bb8e6fb0866f4cae873806dad459 (diff) | |
| download | frameworks_base-458bf39e4cf9297d84a39413fcd2caa9fb81c006.zip frameworks_base-458bf39e4cf9297d84a39413fcd2caa9fb81c006.tar.gz frameworks_base-458bf39e4cf9297d84a39413fcd2caa9fb81c006.tar.bz2 | |
am 713bebda: am 6225b881: am 18bbcf7f: Merge "Copy missing state in DrawableContainer" into jb-mr1.1-dev
* commit '713bebdac508bb8e6fb0866f4cae873806dad459':
Copy missing state in DrawableContainer
Diffstat (limited to 'graphics')
| -rw-r--r-- | graphics/java/android/graphics/drawable/DrawableContainer.java | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/graphics/java/android/graphics/drawable/DrawableContainer.java b/graphics/java/android/graphics/drawable/DrawableContainer.java index 3af2969..a0c9701 100644 --- a/graphics/java/android/graphics/drawable/DrawableContainer.java +++ b/graphics/java/android/graphics/drawable/DrawableContainer.java @@ -491,6 +491,8 @@ public class DrawableContainer extends Drawable implements Drawable.Callback { mComputedConstantSize = orig.mComputedConstantSize; mConstantWidth = orig.mConstantWidth; mConstantHeight = orig.mConstantHeight; + mConstantMinimumWidth = orig.mConstantMinimumWidth; + mConstantMinimumHeight = orig.mConstantMinimumHeight; mOpacity = orig.mOpacity; mHaveStateful = orig.mHaveStateful; |