diff options
| author | Romain Guy <romainguy@google.com> | 2012-11-26 09:44:29 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-11-26 09:45:29 -0800 |
| commit | 18bbcf7f688be41d858b2ac2dd51e7d86371aecb (patch) | |
| tree | 489272b73f56190b1fa365ba586d0e6215656217 /graphics | |
| parent | ce180c10f702d42b9f443b6a6ba7b0acaa5598ef (diff) | |
| parent | fa9b396dbc58990c729fecabbad9e74257bef556 (diff) | |
| download | frameworks_base-18bbcf7f688be41d858b2ac2dd51e7d86371aecb.zip frameworks_base-18bbcf7f688be41d858b2ac2dd51e7d86371aecb.tar.gz frameworks_base-18bbcf7f688be41d858b2ac2dd51e7d86371aecb.tar.bz2 | |
Merge "Copy missing state in DrawableContainer" into jb-mr1.1-dev
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 41b272d..8280d2d 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; |